Merge branch 'master' into ui-regions
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/74c3f35d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/74c3f35d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/74c3f35d Branch: refs/heads/ui-multiple-nics Commit: 74c3f35d7dff5762275baded4074583b2900e7eb Parents: fb9afaa 699cb03 Author: Brian Federle <[email protected]> Authored: Wed Feb 27 13:18:52 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Wed Feb 27 13:18:52 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
