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/d579c937 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d579c937 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d579c937 Branch: refs/heads/marvin-refactor Commit: d579c937bb122e1116c74fa00f8428558a8b15e0 Parents: 08a0788 a723101 Author: John Kinsella <j...@stratosec.co> Authored: Thu Mar 14 12:12:53 2013 -0700 Committer: John Kinsella <j...@stratosec.co> Committed: Thu Mar 14 12:12:53 2013 -0700 ---------------------------------------------------------------------- .../deploy/AbstractDeployPlannerSelector.java | 14 ++++++++++++-- .../cloud/deploy/HypervisorVmPlannerSelector.java | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
