etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Probably a left-over of a merge conflict

This commit is contained in:
Hugo Trippaers 2012-08-02 09:33:48 +02:00
parent 8f797afd42
commit cf06317671
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
client/tomcatconf/commands.properties.in
View File

@ -350,45 +350,44 @@ updateStorageNetworkIpRange=com.cloud.api.commands.UpdateStorageNetworkIpRangeCm
addNetworkDevice=com.cloud.api.commands.AddNetworkDeviceCmd;1
listNetworkDevice=com.cloud.api.commands.ListNetworkDeviceCmd;1
deleteNetworkDevice=com.cloud.api.commands.DeleteNetworkDeviceCmd;1
<<<<<<< HEAD
### Network Devices commands
addNetworkDevice=com.cloud.api.commands.AddNetworkDeviceCmd;1
listNetworkDevice=com.cloud.api.commands.ListNetworkDeviceCmd;1
deleteNetworkDevice=com.cloud.api.commands.DeleteNetworkDeviceCmd;1
### VPC commands
createVPC=com.cloud.api.commands.CreateVPCCmd;15
listVPCs=com.cloud.api.commands.ListVPCsCmd;15
deleteVPC=com.cloud.api.commands.DeleteVPCCmd;15
updateVPC=com.cloud.api.commands.UpdateVPCCmd;15
restartVPC=com.cloud.api.commands.RestartVPCCmd;15
#### VPC offering commands
createVPCOffering=com.cloud.api.commands.CreateVPCOfferingCmd;1
updateVPCOffering=com.cloud.api.commands.UpdateVPCOfferingCmd;1
deleteVPCOffering=com.cloud.api.commands.DeleteVPCOfferingCmd;1
listVPCOfferings=com.cloud.api.commands.ListVPCOfferingsCmd;15
### Network Devices commands
addNetworkDevice=com.cloud.api.commands.AddNetworkDeviceCmd;1
listNetworkDevice=com.cloud.api.commands.ListNetworkDeviceCmd;1
deleteNetworkDevice=com.cloud.api.commands.DeleteNetworkDeviceCmd;1
### VPC commands
createVPC=com.cloud.api.commands.CreateVPCCmd;15
listVPCs=com.cloud.api.commands.ListVPCsCmd;15
deleteVPC=com.cloud.api.commands.DeleteVPCCmd;15
updateVPC=com.cloud.api.commands.UpdateVPCCmd;15
restartVPC=com.cloud.api.commands.RestartVPCCmd;15
#### VPC offering commands
createVPCOffering=com.cloud.api.commands.CreateVPCOfferingCmd;1
updateVPCOffering=com.cloud.api.commands.UpdateVPCOfferingCmd;1
deleteVPCOffering=com.cloud.api.commands.DeleteVPCOfferingCmd;1
listVPCOfferings=com.cloud.api.commands.ListVPCOfferingsCmd;15
#### Private gateway commands
createPrivateGateway=com.cloud.api.commands.CreatePrivateGatewayCmd;1
listPrivateGateways=com.cloud.api.commands.ListPrivateGatewaysCmd;15
deletePrivateGateway=com.cloud.api.commands.DeletePrivateGatewayCmd;1
#### Network ACL commands
createNetworkACL=com.cloud.api.commands.CreateNetworkACLCmd;15
deleteNetworkACL=com.cloud.api.commands.DeleteNetworkACLCmd;15
listNetworkACLs=com.cloud.api.commands.ListNetworkACLsCmd;15
#### Static route commands
createStaticRoute=com.cloud.api.commands.CreateStaticRouteCmd;15
deleteStaticRoute=com.cloud.api.commands.DeleteStaticRouteCmd;15
createPrivateGateway=com.cloud.api.commands.CreatePrivateGatewayCmd;1
listPrivateGateways=com.cloud.api.commands.ListPrivateGatewaysCmd;15
deletePrivateGateway=com.cloud.api.commands.DeletePrivateGatewayCmd;1
#### Network ACL commands
createNetworkACL=com.cloud.api.commands.CreateNetworkACLCmd;15
deleteNetworkACL=com.cloud.api.commands.DeleteNetworkACLCmd;15
listNetworkACLs=com.cloud.api.commands.ListNetworkACLsCmd;15
#### Static route commands
createStaticRoute=com.cloud.api.commands.CreateStaticRouteCmd;15
deleteStaticRoute=com.cloud.api.commands.DeleteStaticRouteCmd;15
listStaticRoutes=com.cloud.api.commands.ListStaticRoutesCmd;15
#### Tags commands
createTags=com.cloud.api.commands.CreateTagsCmd;15
deleteTags=com.cloud.api.commands.DeleteTagsCmd;15
listTags=com.cloud.api.commands.ListTagsCmd;15
#### Tags commands
createTags=com.cloud.api.commands.CreateTagsCmd;15
deleteTags=com.cloud.api.commands.DeleteTagsCmd;15
listTags=com.cloud.api.commands.ListTagsCmd;15
### Site-to-site VPN commands
createVpnCustomerGateway=com.cloud.api.commands.CreateVpnCustomerGatewayCmd;15