Updated Branches: refs/heads/4.1 15bcb0e0c -> 13ec06912
Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/13ec0691 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/13ec0691 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/13ec0691 Branch: refs/heads/4.1 Commit: 13ec069129bf46ffd327d52cf26f5fc363a13284 Parents: 8303dd1 15bcb0e Author: Joe Brockmeier <[email protected]> Authored: Thu Feb 28 19:00:13 2013 -0600 Committer: Joe Brockmeier <[email protected]> Committed: Thu Feb 28 19:00:13 2013 -0600 ---------------------------------------------------------------------- agent/pom.xml | 2 - client/pom.xml | 5 ++ client/tomcatconf/componentContext.xml.in | 3 + .../entity/api/VirtualMachineEntityFactory.java | 41 ----------- .../platform/orchestration/CloudOrchestrator.java | 11 +--- .../src/com/cloud/ucs/database/UcsBladeDao.java | 5 +- .../com/cloud/ucs/database/UcsBladeDaoImpl.java | 9 ++- .../ucs/src/com/cloud/ucs/database/UcsBladeVO.java | 21 +++++- .../src/com/cloud/ucs/database/UcsManagerDao.java | 5 +- .../com/cloud/ucs/database/UcsManagerDaoImpl.java | 9 ++- .../src/com/cloud/ucs/database/UcsManagerVO.java | 12 ++- .../com/cloud/ucs/manager/AddUcsManagerCmd.java | 5 +- .../ucs/manager/AssociateUcsProfileToBladeCmd.java | 13 ++-- .../AssociateUcsProfileToBladeResponse.java | 22 ------ .../src/com/cloud/ucs/manager/ListUcsBladeCmd.java | 3 +- .../com/cloud/ucs/manager/ListUcsManagerCmd.java | 16 ++++- .../com/cloud/ucs/manager/ListUcsProfileCmd.java | 14 ++-- .../src/com/cloud/ucs/manager/StringTemplate.java | 5 +- .../com/cloud/ucs/manager/UcsBladeResponse.java | 12 +++ .../ucs/src/com/cloud/ucs/manager/UcsCommands.java | 7 +- .../src/com/cloud/ucs/manager/UcsHttpClient.java | 12 +++- .../ucs/src/com/cloud/ucs/manager/UcsManager.java | 10 ++- .../src/com/cloud/ucs/manager/UcsManagerImpl.java | 57 +++++++++++---- .../com/cloud/ucs/manager/UcsManagerResponse.java | 5 +- .../com/cloud/ucs/manager/UcsProfileResponse.java | 5 +- .../src/com/cloud/ucs/structure/ComputeBlade.java | 7 +- .../src/com/cloud/ucs/structure/UcsProfile.java | 9 ++- server/pom.xml | 2 - setup/db/db/schema-40to410.sql | 22 ++++++ utils/src/com/cloud/utils/xmlobject/XmlObject.java | 5 +- 30 files changed, 203 insertions(+), 151 deletions(-) ----------------------------------------------------------------------
