Alena Prokharchyk 5cbe3d9722 ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute ...

Conflicts:

	api/src/com/cloud/api/commands/ListVPCsCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java

2012-08-01 18:54:08 -07:00

..

conf

fixing line endings in server

2012-04-07 20:13:10 -04:00

scripts

…

src/com/cloud

ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute

2012-08-01 18:54:08 -07:00

test

VPC: moved vpc related code from NetworkManager to VpcManager

2012-08-01 18:45:06 -07:00

.classpath

bug 6745: Using UUID instead of integers - for System VM s

2011-11-03 07:33:57 -07:00

.project

…