Merge branch 'master' into ui-plugins
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/da8f0be2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/da8f0be2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/da8f0be2 Branch: refs/heads/master Commit: da8f0be2e7ccb7fe60e702356d5597411fde063f Parents: 1a3ea28 264a067 Author: Brian Federle <[email protected]> Authored: Thu Dec 20 13:28:05 2012 -0800 Committer: Brian Federle <[email protected]> Committed: Thu Dec 20 13:28:05 2012 -0800 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
