Alena Prokharchyk 353423acec Merge branch 'master' into vpc ...

Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java

2012-07-06 12:04:10 -07:00

..

conf

fixing line endings in server

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

scripts

…

src/com/cloud

Merge branch 'master' into vpc

2012-07-06 12:04:10 -07:00

test

Merge branch 'master' into vpc

2012-07-06 12:04:10 -07:00

.classpath

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

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

.project

…