You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/12/20 22:28:15 UTC

[1/2] git commit: Merge branch 'master' into ui-plugins

Updated Branches:
  refs/heads/ui-plugins 1a3ea2824 -> da8f0be2e


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/ui-plugins
Commit: da8f0be2e7ccb7fe60e702356d5597411fde063f
Parents: 1a3ea28 264a067
Author: Brian Federle <br...@citrix.com>
Authored: Thu Dec 20 13:28:05 2012 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Dec 20 13:28:05 2012 -0800

----------------------------------------------------------------------
 tools/marvin/marvin/deployDataCenter.py |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)
----------------------------------------------------------------------