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
..
dao	ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails.	2012-08-16 12:59:00 -07:00
firewall	fixed unit tests from merge	2013-01-18 15:58:55 -08:00
security	Changing the number of threads in the test from 1000 to 750. 1000 will more often than not result in build failures due to constraints on the build systems.	2013-04-07 12:17:53 +02:00
vpn	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
MockFirewallManagerImpl.java	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
MockNetworkManagerImpl.java	Merge branch 'master' into internallb1	2013-04-29 16:12:10 -07:00
MockNetworkModelImpl.java	Merge branch 'master' into internallb1	2013-04-29 16:12:10 -07:00
MockRulesManagerImpl.java	CLOUDSTACK-24: mipn feature for isolated and vpc networks	2013-03-04 11:02:09 +05:30
NetworkManagerTest.java	fixed unit tests from merge	2013-01-18 15:58:55 -08:00
NetworkManagerTestComponentLibrary.java	fixed unit tests from merge	2013-01-18 15:58:55 -08:00
NetworkModelTest.java	Making unit tests work	2013-01-22 11:18:51 -08:00
UpdatePhysicalNetworkTest.java	Cloudstack-701 Support for non contiguous vlan ranges.	2013-04-17 10:14:42 +05:30