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

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
David Nalley 2011-12-01 13:02:46 -05:00
parent 8aad5aa10e c106660682
commit 85d84d2ee8
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ listVirtualMachines=com.cloud.api.commands.ListVMsCmd;15
getVMPassword=com.cloud.api.commands.GetVMPasswordCmd;15
migrateVirtualMachine=com.cloud.api.commands.MigrateVMCmd;1
assignVirtualMachine=com.cloud.api.commands.AssignVMCmd;15
restoreVm=com.cloud.api.commands.RestoreVMCmd;15
restoreVirtualMachine=com.cloud.api.commands.RestoreVMCmd;15
#### snapshot commands
createSnapshot=com.cloud.api.commands.CreateSnapshotCmd;15

2
client/tomcatconf/junipersrx_commands.properties.in
View File

@ -7,7 +7,7 @@ deleteExternalFirewall = com.cloud.api.commands.DeleteExternalFirewallCmd;7
listExternalFirewalls = com.cloud.api.commands.ListExternalFirewallsCmd;7
addSrxFirewall = com.cloud.api.commands.AddSrxFirewallCmd;7
deleteSrcFirewall = com.cloud.api.commands.DeleteSrxFirewallCmd;7
deleteSrxFirewall = com.cloud.api.commands.DeleteSrxFirewallCmd;7
configureSrxFirewall = com.cloud.api.commands.ConfigureSrxFirewallCmd;7
listSrxFirewalls = com.cloud.api.commands.ListSrxFirewallsCmd;7
listSrxFirewallNetworks = com.cloud.api.commands.ListSrxFirewallNetworksCmd;7

3
core/src/com/cloud/configuration/ResourceCountVO.java
View File

@ -26,9 +26,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.cloud.configuration.Resource.ResourceOwnerType;
@Entity
@Table(name="resource_count")

1
core/src/com/cloud/configuration/ResourceLimitVO.java
View File

@ -26,7 +26,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
@Entity
@Table(name="resource_limit")