Alena Prokharchyk 56d94fc074 Merge branch 'master' into internallb1 ... Conflicts: plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java server/src/com/cloud/network/vpc/VpcManagerImpl.java		2013-05-09 10:21:34 -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	Fixed up unit testing to use only an in class TestConfiguration	2013-05-07 13:16:43 -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-07 13:13:54 -07:00
MockFirewallManagerImpl.java	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
MockNetworkManagerImpl.java	Dedicate guest vlan range to account	2013-05-07 13:13:54 -07:00
MockNetworkModelImpl.java	CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack	2013-05-07 13:15:30 -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