Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' ...

Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

2013-10-23 12:31:53 -07:00

..

cache

Merge remote-tracking branch 'origin/spring-modularization'

2013-10-23 11:14:42 -07:00

datamotion

Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'

2013-10-23 12:31:53 -07:00

image

Merge remote-tracking branch 'origin/spring-modularization'

2013-10-23 11:14:42 -07:00

integration-test

Squashed & merged commit of the following:

2013-10-23 12:21:43 -07:00

resources/META-INF/cloudstack

Spring Modularization

2013-10-02 15:41:04 -07:00

snapshot

Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'

2013-10-23 12:31:53 -07:00

src/org/apache/cloudstack/storage

Merge remote-tracking branch 'origin/spring-modularization'

2013-10-23 11:14:42 -07:00

volume

Merge remote-tracking branch 'origin/spring-modularization'

2013-10-23 11:14:42 -07:00

pom.xml

Updating pom.xml version numbers for release 4.3.0-SNAPSHOT

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

storage.ucls

Fix license on xml.in, jsp and ucls files on javelin

2013-01-12 06:34:34 -08:00