apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,989 Commits 304 Branches 324 Tags
Commit Graph

3 Commits

Author SHA1 Message Date
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Prasanna Santhanam
f8bbd88a42 maven+marvin: Fix up the activation property 
activation property marvin.config will attempt to deploy a zone again on
running the marvin.test profile. This is unnecessary as marvin.setup
already finishes deploying a zone.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-10 16:16:41 +05:30
Prasanna Santhanam
2e2046fe38 marvin changes to do an pre-integration and integration test 
Introducing the simulator spring context -
simulatorComponentContext.xml.in. This separates the simulator beans so
that production deployments don't have the simulator in them. Context is
enabled with -Dsimulator as part of the developer profile.

Also adding config files - Simulator Config for advanced zone and basic
zone deployments under setup/dev.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-02 18:31:29 +05:30