cloudstack/server
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
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts
src/com/cloud Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00
test Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed 2012-07-06 11:43:31 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project