cloudstack/server/src/com/cloud
Alena Prokharchyk 85677b71fe Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
Conflicts:

	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -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 Patch from Chip Childers 2012-07-02 09:51:21 -04:00
alert Patch from Chip Childers 2012-07-02 09:51:21 -04:00
api Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 2012-07-06 11:43:31 -07:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
baremetal Patch from Chip Childers 2012-07-02 09:51:21 -04:00
capacity Patch from Chip Childers 2012-07-02 09:51:21 -04:00
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 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
consoleproxy add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
dc Encrypting password values that are stored in the cluster_details table 2012-07-03 17:27:21 -07:00
deploy Patch from Chip Childers 2012-07-02 09:51:21 -04:00
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 Patch from Chip Childers 2012-07-02 09:51:21 -04:00
host/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
hypervisor 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
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 Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00
offerings Patch from Chip Childers 2012-07-02 09:51:21 -04:00
projects Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00
resource Patch from Chip Childers 2012-07-02 09:51:21 -04:00
resourcelimit CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account. 2012-07-03 04:35:53 +05:30
secstorage Patch from Chip Childers 2012-07-02 09:51:21 -04:00
server Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 2012-07-06 11:43:31 -07:00
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet Patch from Chip Childers 2012-07-02 09:51:21 -04:00
storage Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00
tags Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00
template Patch from Chip Childers 2012-07-02 09:51:21 -04:00
test 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
usage 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
uuididentity Patch from Chip Childers 2012-07-02 09:51:21 -04:00
vm Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00