Prachi Damle 4a1eaf45bd Merge branch 'master' into affinity_groups ... Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java setup/db/db/schema-410to420.sql		2013-04-10 11:34:30 -07:00
..
acl/static-role-based	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
affinity-group-processors/host-anti-affinity	More log statements to debug	2013-04-05 17:59:50 -07:00
alert-handlers	CLOUDSTACK-712: Feature Syslog Enhancements	2013-03-29 09:53:05 +05:30
api	marvin+apidiscovery: Extend API discovery plugin	2013-04-02 18:31:30 +05:30
deployment-planners	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
event-bus/rabbitmq	CLOUDSTACK-1391: EventBus is not getting injected after javelin merge	2013-02-27 18:55:22 +05:30
file-systems/netapp	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
host-allocators/random	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
hypervisors	1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous	2013-04-10 11:35:58 +08:00
network-elements	CLOUDSTACK-779 Egress firewall rules support for Juniper SRX	2013-04-10 10:54:04 -07:00
storage	fix bunch of bugs related to zone wide storage	2013-04-03 21:51:17 -07:00
storage-allocators/random	fix compile	2013-02-26 21:44:44 -08:00
user-authenticators	CLOUDSTACK-1734: Make SHA1 default password encoding mechanism	2013-04-02 17:40:50 -07:00
pom.xml	Merge branch 'master' into affinity_groups	2013-04-05 13:49:20 -07:00