Merge branch 'master' into events-framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5e14db0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5e14db0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5e14db0c Branch: refs/heads/events-framework Commit: 5e14db0c7418a98b36d45f954fc2420e27ff405e Parents: e211499 cae89c6 Author: Murali Reddy <[email protected]> Authored: Thu Jan 31 21:54:40 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Thu Jan 31 21:54:40 2013 +0530 ---------------------------------------------------------------------- ui/scripts/network.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
