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

..

apidoc

Merge branch 'master' into vpc

2012-06-28 17:44:08 -07:00

bindir

applying the commits from Chip Childers licensing cleanup

2012-06-26 10:44:04 -04:00

db

Merge branch 'master' into vpc

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

.project

Branch 2.1.refactor committed

2010-08-11 09:13:42 -07:00