Alena Prokharchyk b727001f48 CLOUDSTACK-4315: VPC - when fail to add nic to the VR, a) remove the nic b) remove the reference to nic from router_network_ref table. Before the fix b) was missing, and it caused NPEs when tried to apply the rules on the routers not having nic in the network ... Conflicts: server/src/com/cloud/network/element/VirtualRouterElement.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java		2013-08-14 11:44:34 -07:00
..
conf	Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format	2013-07-26 20:35:49 -07:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	CLOUDSTACK-4315: VPC - when fail to add nic to the VR, a) remove the nic b) remove the reference to nic from router_network_ref table. Before the fix b) was missing, and it caused NPEs when tried to apply the rules on the routers not having nic in the network	2013-08-14 11:44:34 -07:00
test	Resolved merge conflicts	2013-08-12 20:15:24 -07:00
pom.xml	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00