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
..
apidoc	Internallb: new set of Web services APIs for managing Internal LB VMs	2013-04-25 14:03:40 -07:00
appliance	appliance: Don't mkdir 70-persistent-net.rules for systemvms	2013-04-19 09:05:42 +05:30
bugs-wiki	fixing license headers in marvin	2012-07-04 18:45:08 -04:00
build	Adding new release manager scripts to master (used for 4.1.0 RCs)	2013-04-22 12:48:44 -04:00
cli	CLOUDSTACK-2020: Make cli's requester unicode friendly	2013-04-16 10:41:21 +05:30
devcloud	QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package	2013-04-09 14:45:27 -07:00
devcloud-kvm	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
eclipse	Added a shell script to set the maven profiles in eclipse	2013-03-13 20:21:58 -07:00
git	Summary: Add default newline after summary in prepare-commit-msg	2013-02-06 10:23:17 -07:00
marvin	Multiple fixes to marvin framework	2013-04-26 12:16:08 +05:30
transifex	Needs to force the download of l10n resource files	2013-04-29 16:18:11 +01:00
whisker	Removing waf legal docs	2013-04-05 16:44:08 +01:00
pom.xml	Fix broken build: apidocs had been commented out for some strange reason	2013-02-22 10:13:30 -08:00