Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4b638672 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b638672 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b638672 Branch: refs/heads/ui-restyle Commit: 4b638672b61f093780e4c9d4997025322579442d Parents: 157836b 34c04a4 Author: Brian Federle <[email protected]> Authored: Tue Sep 24 11:18:48 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Sep 24 11:18:48 2013 -0700 ---------------------------------------------------------------------- agent/bindir/cloudstack-agent-upgrade.in | 63 ++ agent/bindir/libvirtqemuhook.in | 53 ++ debian/cloudstack-agent.postinst | 10 +- debian/rules | 4 +- .../framework/jobs/impl/AsyncJobMonitor.java | 35 +- packaging/centos63/cloud.spec | 15 +- .../kvm/resource/BridgeVifDriver.java | 13 +- pom.xml | 59 +- python/lib/cloudutils/networkConfig.py | 5 + scripts/vm/network/security_group.py | 21 +- .../com/cloud/api/query/QueryManagerImpl.java | 3 +- ui/modules/vpc/vpc.js | 2 +- ui/scripts/accounts.js | 2 +- ui/scripts/globalSettings.js | 4 +- ui/scripts/instances.js | 6 + ui/scripts/network.js | 4 +- ui/scripts/sharedFunctions.js | 35 +- ui/scripts/storage.js | 2 +- ui/scripts/system.js | 856 +++++++++---------- ui/scripts/templates.js | 2 +- ui/scripts/vm_snapshots.js | 9 +- ui/scripts/zoneWizard.js | 20 +- utils/src/com/cloud/utils/NumbersUtil.java | 82 +- utils/test/com/cloud/utils/NumbersUtilTest.java | 4 +- 24 files changed, 734 insertions(+), 575 deletions(-) ----------------------------------------------------------------------
