Updated Branches: refs/heads/junit-tests 8f4ecc983 -> 2b8c0d474
Merge branch 'master' into junit-tests Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b8c0d47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2b8c0d47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2b8c0d47 Branch: refs/heads/junit-tests Commit: 2b8c0d4742b2538fbf5af9135fc131a03ef2aab1 Parents: 8f4ecc9 5c4cf11 Author: Chip Childers <chip.child...@gmail.com> Authored: Tue Sep 25 13:42:10 2012 -0400 Committer: Chip Childers <chip.child...@gmail.com> Committed: Tue Sep 25 13:42:10 2012 -0400 ---------------------------------------------------------------------- .../src/com/cloud/agent/manager/MockVmManager.java | 21 +-- .../com/cloud/agent/manager/MockVmManagerImpl.java | 67 +++++---- .../cloud/agent/manager/SimulatorManagerImpl.java | 46 +----- cloud.spec | 7 +- docs/en-US/configure-package-repository.xml | 4 +- .../management-server-install-db-external.xml | 99 +++++++------ docs/en-US/management-server-install-db-local.xml | 82 ++++------- docs/en-US/management-server-install-db.xml | 34 +++++ docs/en-US/management-server-install-flow.xml | 3 +- .../en-US/management-server-install-multi-node.xml | 2 +- .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +- tools/guest_password/cloud-set-guest-password | 116 +++++++++++++++ .../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +- .../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +- wscript | 8 + 16 files changed, 303 insertions(+), 200 deletions(-) ----------------------------------------------------------------------
