apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.16'

Browse Source
This commit is contained in:
nvazquez 2022-04-01 13:14:09 -03:00
commit 5f3a392eb5
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
View File

@ -394,7 +394,7 @@ public class ApiConstants {
public static final String USER_CONFIGURABLE = "userconfigurable";
public static final String USER_SECURITY_GROUP_LIST = "usersecuritygrouplist";
public static final String USE_VIRTUAL_NETWORK = "usevirtualnetwork";
public static final String Update_IN_SEQUENCE = "updateinsequence";
public static final String UPDATE_IN_SEQUENCE = "updateinsequence";
public static final String VALUE = "value";
public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";

2
api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
View File

@ -72,7 +72,7 @@ public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd implements UserCmd {
@Parameter(name = ApiConstants.GUEST_VM_CIDR, type = CommandType.STRING, description = "CIDR for guest VMs, CloudStack allocates IPs to guest VMs only from this CIDR")
private String guestVmCidr;
@Parameter(name =ApiConstants.Update_IN_SEQUENCE, type=CommandType.BOOLEAN, description = "if true, we will update the routers one after the other. applicable only for redundant router based networks using virtual router as provider")
@Parameter(name =ApiConstants.UPDATE_IN_SEQUENCE, type=CommandType.BOOLEAN, description = "if true, we will update the routers one after the other. applicable only for redundant router based networks using virtual router as provider")
private Boolean updateInSequence;
@Parameter(name = ApiConstants.DISPLAY_NETWORK,

1
ui/public/locales/en.json
View File

@ -2278,6 +2278,7 @@
"label.unmanaged.instance": "Unmanaged Instance",
"label.unmanaged.instances": "Unmanaged Instances",
"label.untagged": "Untagged",
"label.updateinsequence": "Update In Sequence",
"label.update.instance.group": "Update Instance Group",
"label.update.ip.range": "Update IP range",
"label.update.network": "Update Network",