cloudstack/client
Alena Prokharchyk 7b24a7640c Merge branch 'master' into internallb1
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-29 16:12:10 -07:00
..
WEB-INF Update l10n resource file Web-UI with latest version from transifex. 2013-04-29 16:24:21 +01:00
bindir Summary: update packaging 2013-02-05 10:47:42 +01:00
distro init: Explicitly set the HOME variable to the homedir of the user cloud 2013-01-09 13:11:21 +01:00
tomcatconf Merge branch 'master' into internallb1 2013-04-29 16:12:10 -07:00
pom.xml Merge branch 'master' into internallb1 2013-04-29 16:12:10 -07:00