cloudstack

mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00

History

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

bindir

fixing utils license header

2012-06-06 23:06:02 -04:00

certs

Update fail-safe keystore with RSA private key

2011-07-25 18:55:16 -07:00

conf

fixing line ends in utils

2012-04-09 20:05:41 -04:00

src

Merge branch 'master' into vpc