Koushik Das ef9830d6a4 Merge branch '4.5' ...

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	tools/appliance/build.sh

2014-12-09 14:59:36 +05:30

..

resources/META-INF/cloudstack

Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package

2014-01-21 17:19:52 -08:00

src

Merge branch '4.5'

2014-12-09 14:59:36 +05:30

test

CreateSecondaryStagingStoreCmdTest.java: add license header

2014-11-30 23:15:15 -05:00

pom.xml

Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT

2014-10-29 14:54:23 +01:00