Kelven Yang 75bb38394b CLOUDSTACK-3869: fix merge conflicts

2013-09-04 14:49:45 -07:00

..

acl/static-role-based

Updating pom.xml version numbers for release 4.3.0-SNAPSHOT

2013-08-01 10:35:00 -04:00

affinity-group-processors

Changes required to merge to master:

2013-09-03 20:03:11 -07:00

alert-handlers

Fixed up the pom.xml to use dependencies specified in cloudstack pom

2013-08-02 13:51:47 -07:00

api

Bring up to date with master

2013-08-31 00:25:48 +01:00

dedicated-resources

CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues

2013-09-03 20:02:56 -07:00

deployment-planners

Revert "Reverting the range of commits that broke the build"

2013-08-08 15:02:40 -07:00

event-bus/rabbitmq

Updating pom.xml version numbers for release 4.3.0-SNAPSHOT

2013-08-01 10:35:00 -04:00

file-systems/netapp

Updating pom.xml version numbers for release 4.3.0-SNAPSHOT

2013-08-01 10:35:00 -04:00

host-allocators/random

Updating pom.xml version numbers for release 4.3.0-SNAPSHOT

2013-08-01 10:35:00 -04:00

hypervisors

CLOUDSTACK-3869: fix merge conflicts

2013-09-04 14:49:45 -07:00

network-elements

CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods

2013-09-01 22:53:23 +02:00

storage

Make Mutual CHAP optional for VMware.

2013-08-26 16:08:37 -06:00

storage-allocators/random

Updating pom.xml version numbers for release 4.3.0-SNAPSHOT

2013-08-01 10:35:00 -04:00

user-authenticators

copyright

2013-09-01 23:59:53 +02:00

pom.xml

Revert "CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor"

2013-08-24 07:12:23 +00:00