You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/06/07 05:07:38 UTC
[1/5] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Updated Branches:
refs/heads/master ef4f0c695 -> bd55f1853
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bd55f185
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bd55f185
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bd55f185
Branch: refs/heads/master
Commit: bd55f185348d5aa739991960161eef666ca6e4ba
Parents: 937a9f7 ef4f0c6
Author: David Nalley <da...@gnsa.us>
Authored: Wed Jun 6 23:06:41 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Wed Jun 6 23:06:41 2012 -0400
----------------------------------------------------------------------
.../cloud/consoleproxy/ConsoleProxyVncClient.java | 3 +
.../hypervisor/vmware/resource/VmwareResource.java | 8 +-
.../cloud/hypervisor/vmware/VmwareManagerImpl.java | 40 ++--
.../src/com/cloud/network/NetworkManagerImpl.java | 16 +-
.../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 185 +++++++++++++--
.../com/cloud/network/MockNetworkManagerImpl.java | 17 +-
.../upgrade/AdvanceZone223To224UpgradeTest.java | 8 +-
.../cloud/vm/MockVirtualMachineManagerImpl.java | 18 ++
setup/db/db/schema-302to303.sql | 4 +
9 files changed, 233 insertions(+), 66 deletions(-)
----------------------------------------------------------------------