etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,380 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

6 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
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Sheng Yang 8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 2012-07-02 16:28:44 -07:00
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Edison Su 5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
Murali reddy 550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00