cloudstack/server/test/com/cloud
Alena Prokharchyk 697aa4589b VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend
Conflicts:

	api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-10 18:07:09 -07:00
..
agent Patch from Chip Childers 2012-07-02 09:51:21 -04:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster Patch from Chip Childers 2012-07-02 09:51:21 -04:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
network VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend 2012-07-10 18:07:09 -07:00
snapshot Patch from Chip Childers 2012-07-02 09:51:21 -04:00
storage/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
upgrade Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user Patch from Chip Childers 2012-07-02 09:51:21 -04:00
utils/db Patch from Chip Childers 2012-07-02 09:51:21 -04:00
vm Merge branch 'master' into vpc 2012-07-06 12:04:10 -07:00