cloudstack/server/src/com/cloud
Alena Prokharchyk e74969fdec VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-13 11:55:34 -07:00
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl Patch from Chip Childers 2012-07-02 09:51:21 -04:00
agent Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
alert Patch from Chip Childers 2012-07-02 09:51:21 -04:00
api Merge branch 'master' into vpc 2012-08-08 11:50:39 -07:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
baremetal Move KVM related code into plugins/hypervisor/kvm, a new jar file is 2012-07-30 14:55:47 -07:00
capacity bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
certificate/dao 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
configuration S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation 2012-08-10 16:24:35 -07:00
consoleproxy bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
dc Merge branch 'master' into vpc 2012-07-06 12:04:10 -07:00
deploy bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
domain Patch from Chip Childers 2012-07-02 09:51:21 -04:00
event Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ha VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 2012-08-03 14:23:45 -07:00
host/dao Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
hypervisor Merge branch 'master' into vpc 2012-08-01 19:04:28 -07:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
maint Patch from Chip Childers 2012-07-02 09:51:21 -04:00
migration Patch from Chip Childers 2012-07-02 09:51:21 -04:00
network VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 2012-08-13 11:55:34 -07:00
offerings Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
projects ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
resource Patch fixes file names and imports wherever used, in files introduced in 2012-07-31 10:38:11 -07:00
resourcelimit Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
secstorage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
server Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet should have used non url safe 2012-08-07 16:58:16 -07:00
storage Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
tags Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
template Patch from Chip Childers 2012-07-02 09:51:21 -04:00
test Merge branch 'master' into vpc 2012-08-02 18:45:37 -07:00
upgrade Removed @author tags in some classes 2012-08-03 14:25:17 -07:00
usage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
uuididentity ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 2012-08-01 18:54:08 -07:00
vm Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00