cloudstack/plugins
Koushik Das 0232048f90 Merge branch 'master' into cisco-vnmc-api-integration
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	setup/db/db/schema-410to420.sql
	tools/marvin/marvin/integration/lib/base.py
2013-04-15 17:05:59 +05:30
..
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 Single AffinityGroupProcessor could process multiple groups of same type. 2013-04-11 17:29:42 -07:00
alert-handlers CLOUDSTACK-1993: fixed the issue of not sending syslog messages for alertType 0 2013-04-12 07:15:06 +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 Merge branch 'master' into cisco-vnmc-api-integration 2013-04-15 17:05:59 +05:30
network-elements Merge branch 'master' into cisco-vnmc-api-integration 2013-04-15 17:05:59 +05:30
storage Fixed typos 2013-04-13 13:28:32 +00: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 cisco-vnmc-api-integration 2013-04-15 17:05:59 +05:30