etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud
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
..
acl committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
agent/api CS-6840: Add hypervisor commands for site-to-site vpn 2012-07-02 16:28:44 -07:00
alert committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
api Merge branch 'master' into vpc 2012-07-06 12:04:10 -07:00
async VPC: intermidiate checkin to Static Routes 2012-06-25 21:00:57 -07:00
capacity committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
cluster committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
configuration VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 2012-07-03 17:23:40 -07:00
consoleproxy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dao committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dc committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
deploy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
domain committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
event CS-6840: Add commands for site-to-site vpn 2012-07-02 16:26:34 -07:00
exception committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
host committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
hypervisor Plug nic support 2012-06-15 14:07:46 -07:00
network VPC: added field networkacl_service_provided to physical_network_service_providers table 2012-07-06 11:08:39 -07:00
offering Support for adding private network 2012-06-15 14:20:34 -07:00
org committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
projects committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
resource CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster 2012-06-22 13:31:56 -07:00
serializer committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
server Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 2012-07-06 11:43:31 -07:00
storage Initial checkin for VPC feature: 2012-06-15 13:53:59 -07:00
template committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
user committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
uservm committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
vm Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton 2012-06-15 14:22:40 -07:00