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/d97be4f6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d97be4f6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d97be4f6 Branch: refs/heads/ui-restyle Commit: d97be4f6ebbcc5c4f9f346f858de03f5c0fbf824 Parents: 7b6be2d b44bc9d Author: Brian Federle <[email protected]> Authored: Wed Oct 2 10:53:33 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Wed Oct 2 10:53:33 2013 -0700 ---------------------------------------------------------------------- .../config/dao/ConfigurationDaoImpl.java | 3 +- .../metadata/ResourceMetaDataManagerImpl.java | 40 ++--- server/src/com/cloud/vm/UserVmManager.java | 4 + server/src/com/cloud/vm/UserVmManagerImpl.java | 83 +++++----- .../component/test_netscaler_nw_off.py | 45 +----- usage/resources/usageApplicationContext.xml | 2 +- utils/src/com/cloud/utils/NumbersUtil.java | 155 ++----------------- utils/test/com/cloud/utils/NumbersUtilTest.java | 24 ++- 8 files changed, 92 insertions(+), 264 deletions(-) ----------------------------------------------------------------------
