Murali Reddy f82c6a8431 Merge branch 'master' into portablepublicip ... Conflicts: api/src/com/cloud/network/IpAddress.java api/src/org/apache/cloudstack/api/ResponseGenerator.java client/tomcatconf/commands.properties.in server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java setup/db/db/schema-410to420.sql		2013-05-11 23:32:13 +05:30
..
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	Fixed up unit testing to use only an in class TestConfiguration	2013-05-06 16:34:27 -07:00
vpn	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
DedicateGuestVlanRangesTest.java	Dedicate guest vlan range to account	2013-05-06 10:02:41 +05:30
MockFirewallManagerImpl.java	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
MockNetworkManagerImpl.java	Merge branch 'master' into portablepublicip	2013-05-11 23:32:13 +05:30
MockNetworkModelImpl.java	CLOUDSTACK-747: Internal LB between VPC tiers support	2013-05-09 11:54:41 -07:00
MockRulesManagerImpl.java	fix bug CLOUDSTACK-2341 remove network from VM is not removing PF/LB/static nat rules for the VM	2013-05-09 11:04:30 +08:00
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