etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,570 Commits 342 Branches 328 Tags 952 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
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
Alex Huang e2a32ab4f7 Introduced plugins directory. 
Moved ovm into plugins.
Introduced build.xml for ovm.
 2012-06-19 18:27:09 -07:00
frank 32cb4da2f3 add classpath and project file for ovm 2011-08-30 15:59:39 -07:00