[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 709ebf606238f7246f7aa95afdae2be1bdf4ea87
Merge: f893c5c 6e7516c
Author: Rohit Yadav
AuthorDate: Thu Mar 4 15:00:51 2021 +0530
Merge remote-tracking branch 'origin/4.13' into 4.14
scripts/vm/network/security_group.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc scripts/vm/network/security_group.py
index 680177e,21f6f7e..0783e4a
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@@ -145,47 -147,9 +145,47 @@@ def split_ips_by_family(ips)
ip6s.append(ip)
return ip4s, ip6s
+def destroy_network_rules_for_nic(vm_name, vm_ip, vm_mac, vif, sec_ips):
+try:
+rules = execute("""iptables-save -t filter | awk '/ %s / { sub(/-A/,
"-D", $1) ; print }'""" % vif ).split("\n")
+for rule in filter(None, rules):
+try:
+execute("iptables " + rule)
+except:
+logging.debug("Ignoring failure to delete rule: " + rule)
+except:
+pass
+
+try:
+dnats = execute("""iptables-save -t nat | awk '/ %s / { sub(/-A/,
"-D", $1) ; print }'""" % vif ).split("\n")
+for dnat in filter(None, dnats):
+try:
+execute("iptables -t nat " + dnat)
+except:
+logging.debug("Ignoring failure to delete dnat: " + dnat)
+except:
+pass
+
+ips = sec_ips.split(';')
+ips.pop()
+ips.append(vm_ip)
+add_to_ipset(vm_name, ips, "-D")
+ebtables_rules_vmip(vm_name, vm_mac, ips, "-D")
+
+vmchain_in = vm_name + "-in"
+vmchain_out = vm_name + "-out"
+vmchain_in_src = vm_name + "-in-src"
+vmchain_out_dst = vm_name + "-out-dst"
+try:
+execute("ebtables -t nat -D " + vmchain_in_src + " -s " + vm_mac + "
-j RETURN")
+execute("ebtables -t nat -D " + vmchain_out_dst + " -p ARP --arp-op
Reply --arp-mac-dst " + vm_mac + " -j RETURN")
+execute("ebtables -t nat -D PREROUTING -i " + vif + " -j " +
vmchain_in)
+execute("ebtables -t nat -D POSTROUTING -o " + vif + " -j " +
vmchain_out)
+except:
+logging.debug("Ignoring failure to delete ebtable rules for vm: " +
vm_name)
def get_bridge_physdev(brname):
- physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+:
vnet/ {print $2}' | head -1" % brname)
+ physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+:
vnet/ {print $2}' | head -1 | cut -d ':' -f1" % brname)
return physdev.strip()
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1efe6e2df06a9fb6ff12b86b966724e6f224ed45
Merge: ca1e02f d6152b3
Author: Rohit Yadav
AuthorDate: Thu Sep 24 12:13:23 2020 +0530
Merge remote-tracking branch 'origin/4.13' into 4.14
Signed-off-by: Rohit Yadav
api/src/main/java/com/cloud/network/Networks.java | 49 ++
.../engine/orchestration/NetworkOrchestrator.java | 23 ++-
.../orchestration/NetworkOrchestratorTest.java | 74 ++
3 files changed, 131 insertions(+), 15 deletions(-)
diff --cc
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index ab2d8f3,c49da14..804775a
---
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@@ -2311,9 -2279,7 +2311,9 @@@ public class NetworkOrchestrator extend
}
if (vlanSpecified) {
- URI uri = BroadcastDomainType.fromString(vlanId);
+ URI uri = encodeVlanIdIntoBroadcastUri(vlanId, pNtwk);
+// Aux: generate secondary URI for secondary VLAN ID (if
provided) for performing checks
+URI secondaryUri = isNotBlank(isolatedPvlan) ?
BroadcastDomainType.fromString(isolatedPvlan) : null;
//don't allow to specify vlan tag used by physical network for
dynamic vlan allocation
if (!(bypassVlanOverlapCheck && ntwkOff.getGuestType() ==
GuestType.Shared) && _dcDao.findVnet(zoneId, pNtwk.getId(),
BroadcastDomainType.getValue(uri)).size() > 0) {
throw new InvalidParameterValueException("The VLAN tag " +
vlanId + " is already being used for dynamic vlan allocation for the guest
network in zone "
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 578d29e16650d519e80928c33e0956d6ed1fa1b9 Merge: 14c0d9e 5c29d5b Author: Rohit Yadav AuthorDate: Tue Sep 1 16:01:52 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 Signed-off-by: Rohit Yadav pom.xml| 2 +- .../main/java/com/cloud/server/StatsCollector.java | 30 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --cc pom.xml index d6ec3d5,64a34f7..47e9a8d --- a/pom.xml +++ b/pom.xml @@@ -103,59 -99,57 +103,59 @@@ 2.5.4 1.3 -4.12 +4.13 1.13.1 18.0 -1.10.19 -1.6.4 +3.2.4 +2.0.5 1.0-20081010.060147 1.0.1 -6.1.1 +7.1.0 2.11.0 -2.11.0 +2.12.0 -5.1.1 +5.8.0 1.0.9 -1.7.1 -1.11.213 +1.9.5 +1.11.717 1.2.8 1.4 -1.5.6 -1.9.1 -1.59 -3.2.5 -8.7 -3.2.0 +1.12 +1.64 +3.3.0 +8.18 +3.2.6 2.6.11 -0.0.23 -2.4.12 +0.0.27 +1.34.2 +2.4.17 1.7.2 -23.6-jre -4.5.4 -4.4.8 +28.2-jre +4.5.11 +4.4.13 - 2.17 + 2.20 -2.9.2 -1.9.2 -0.16 -3.22.0-GA -2.10.3 +2.10.3 +1.9.3 +0.17 +3.26.0-GA + 3.1.1 +1.3.2 +2.3.0 +2.3.2-1 1.19.4 -9.4.8.v20171121 - 9.2.22.v20170606 +9.4.27.v20200227 + 9.4.27.v20200227 4.0.0 -2.8.1 -2.2.0 -0.1.54 +2.10.5 +2.2.1 +0.1.55 20090211 1.2 -1.2.1 -0.11.0.1 +0.11.0.3 0.5.1 1.5.0-b01 -5.1.34 +8.0.19 2.0.4 10.1 2.6.4
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 14c0d9eaa7a37ad2f0d9a81d55311680e430b689 Merge: 8dfc11a ba4b04f Author: Rohit Yadav AuthorDate: Fri Aug 28 14:59:15 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 ui/scripts/instances.js | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 05ae3f8d8181696abfce367609ef9101e6d9f88d Merge: 9681a28 1da76d2 Author: Rohit Yadav AuthorDate: Fri Aug 21 15:38:18 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 agent/conf/agent.properties | 5 + .../hypervisor/kvm/resource/LibvirtComputingResource.java | 13 ++--- .../hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java | 3 ++- 3 files changed, 17 insertions(+), 4 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 6b6cc71be9ac77166e899b27328ae40e5f0f2ac0 Merge: ce7a32c 86939e7 Author: Rohit Yadav AuthorDate: Wed Aug 12 13:44:41 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../api/command/user/vpc/CreateStaticRouteCmd.java | 2 +- .../api/command/user/vpc/ListStaticRoutesCmd.java | 7 +++ .../java/com/cloud/network/vpc/dao/StaticRouteDao.java | 2 ++ .../com/cloud/network/vpc/dao/StaticRouteDaoImpl.java | 9 + .../java/com/cloud/network/vpc/VpcManagerImpl.java | 18 +- ui/scripts/vpc.js | 3 ++- 6 files changed, 38 insertions(+), 3 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 3bd1ddec88415075c157b41d2a0962d1c2657bbd Merge: ba76778 affd010 Author: Rohit Yadav AuthorDate: Wed Jul 15 16:14:58 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../storage/template/HttpTemplateDownloader.java | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit ba767783bd733832524fabdc7a683c300e309b49 Merge: db9f825 139aa13 Author: Rohit Yadav AuthorDate: Wed Jul 8 11:36:30 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../src/main/java/org/apache/cloudstack/saml/SAMLUtils.java | 2 +- server/src/main/java/com/cloud/api/ApiServlet.java | 13 + 2 files changed, 10 insertions(+), 5 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit b141b8e256c4d824052e62b2f4158b790cf67430 Merge: b64d0b2 4da374b Author: Rohit Yadav AuthorDate: Tue Jul 7 12:51:46 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../src/main/java/com/cloud/deploy/DeploymentPlanningManager.java | 3 +++ .../main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 6 ++ server/src/main/java/com/cloud/server/ManagementServerImpl.java | 5 + 3 files changed, 10 insertions(+), 4 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 26f4edff34b2b05081548ba593763ae55505cedf
Merge: b534d2b 5526342
Author: Rohit Yadav
AuthorDate: Thu Jun 25 10:42:15 2020 +0530
Merge remote-tracking branch 'origin/4.13' into 4.14
Signed-off-by: Rohit Yadav
.../org/apache/cloudstack/api/ApiConstants.java| 3 +++
.../api/response/DomainRouterResponse.java | 16 +++
.../cloudstack/api/response/IPAddressResponse.java | 11 +-
.../api/response/PrivateGatewayResponse.java | 10 -
.../api/response/Site2SiteVpnGatewayResponse.java | 8
.../cloudstack/api/response/SystemVmResponse.java | 24 ++
.../cloudstack/api/response/UserVmResponse.java| 13 +++-
.../cloudstack/api/response/VpcResponse.java | 8
.../main/java/com/cloud/api/ApiResponseHelper.java | 6 ++
.../api/query/dao/DomainRouterJoinDaoImpl.java | 13 +++-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 7 ++-
.../com/cloud/storage/VolumeApiServiceImpl.java| 17 +++
12 files changed, 131 insertions(+), 5 deletions(-)
diff --cc
api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
index b8b0189,b37e1c8..44eaba7
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
@@@ -298,14 -290,10 +298,18 @@@ public class UserVmResponse extends Bas
@Param(description = "OS type id of the vm", since = "4.4")
private String osTypeId;
+ @SerializedName(ApiConstants.OS_DISPLAY_NAME)
+ @Param(description = "OS name of the vm", since = "4.13.2")
+ private String osDisplayName;
+
+@SerializedName(ApiConstants.BOOT_MODE)
+@Param(description = "Guest vm Boot Mode")
+private String bootMode;
+
+@SerializedName(ApiConstants.BOOT_TYPE)
+@Param(description = "Guest vm Boot Type")
+private String bootType;
+
public UserVmResponse() {
securityGroupList = new LinkedHashSet();
nics = new LinkedHashSet();
@@@ -882,12 -858,7 +890,15 @@@
return osTypeId;
}
+ public String getOsDisplayName() {
+ return osDisplayName;
+ }
++
+public String getBootType() { return bootType; }
+
+public void setBootType(String bootType) { this.bootType = bootType; }
+
+public String getBootMode() { return bootMode; }
+
+public void setBootMode(String bootMode) { this.bootMode = bootMode; }
-
}
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 9642392a0a6974e6277f696f8e50b63c36a7b7b9 Merge: 615ab4e c03f8a1 Author: Rohit Yadav AuthorDate: Wed Jun 24 19:25:30 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 Signed-off-by: Rohit Yadav .../api/command/LdapListConfigurationCmd.java | 8 ++ .../apache/cloudstack/ldap/LdapManagerImpl.java| 3 ++- .../cloudstack/ldap/dao/LdapConfigurationDao.java | 4 +++ .../ldap/dao/LdapConfigurationDaoImpl.java | 30 +- 4 files changed, 37 insertions(+), 8 deletions(-) diff --cc plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java index b591e3a,78c9bae..c053e87 --- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java +++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java @@@ -88,4 -104,4 +104,4 @@@ public class LdapConfigurationDaoImpl e } return sc; } --} ++}
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 615ab4ef2ced770ad0c19bf8d21d92bc2a348b0a Merge: 5f23171 8010718 Author: Rohit Yadav AuthorDate: Wed Jun 24 08:23:43 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../java/com/cloud/api/query/QueryManagerImpl.java | 23 +- 1 file changed, 14 insertions(+), 9 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 5f23171ff30f4b36aa5f5353adb912e307669f46 Merge: afce828 97f21c1 Author: Rohit Yadav AuthorDate: Tue Jun 23 12:27:48 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../com/cloud/vm/VirtualMachineManagerImpl.java| 1 - .../xenserver/resource/CitrixResourceBase.java | 33 +--- .../xenbase/CitrixMigrateCommandWrapper.java | 3 +- .../wrapper/xenbase/CitrixStartCommandWrapper.java | 59 -- .../network/element/ConfigDriveNetworkElement.java | 12 ++--- 5 files changed, 53 insertions(+), 55 deletions(-) diff --cc plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index ea168d5,f9ec05a..87adcb3 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@@ -204,8 -200,13 +204,14 @@@ public abstract class CitrixResourceBas } private final static int BASE_TO_CONVERT_BYTES_INTO_KILOBYTES = 1024; +private final static String BASE_MOUNT_POINT_ON_REMOTE = "/var/cloud_mount/"; + private final static int USER_DEVICE_START_ID = 3; + + private final static String VM_NAME_ISO_SUFFIX = "-ISO"; + + private final static String VM_FILE_ISO_SUFFIX = ".iso"; + private static final XenServerConnectionPool ConnPool = XenServerConnectionPool.getInstance(); // static min values for guests on xenserver private static final long mem_128m = 134217728L;
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit afce828dd1ba3a9cfb51bb9c3a0f322b9b52145d Merge: 148fab4 7e50f4a Author: Rohit Yadav AuthorDate: Sat Jun 20 10:48:06 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 - 1 file changed, 8 insertions(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 148fab4e431644013e2dde51ba9e1053a42b920d
Merge: 88c5e6e 06f3ff0
Author: Rohit Yadav
AuthorDate: Thu Jun 18 19:48:12 2020 +0530
Merge remote-tracking branch 'origin/4.13' into 4.14
.../src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java | 4 ++--
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --cc server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 1847d51,c41cd0e..8cac107
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@@ -1764,9 -1690,9 +1765,9 @@@ public class QueryManagerImpl extends M
Pair, Integer> result =
searchForVolumesInternal(cmd);
ListResponse response = new
ListResponse();
-ResponseView respView = ResponseView.Restricted;
+ResponseView respView = cmd.getResponseView();
Account account = CallContext.current().getCallingAccount();
- if (_accountMgr.isAdmin(account.getAccountId())) {
+ if (_accountMgr.isRootAdmin(account.getAccountId())) {
respView = ResponseView.Full;
}
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit c94315545f1dcb725906290ec6accbc8c10b5b78 Merge: b54d19b 88d51ce Author: Rohit Yadav AuthorDate: Wed Jun 17 07:38:14 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../src/main/java/com/cloud/network/vpc/VpcManagerImpl.java | 11 +++ 1 file changed, 11 insertions(+)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit e94a54f3b4cb1a0960e2a526e90de34034aaca48 Merge: 3de5ca9 6a683dc Author: Rohit Yadav AuthorDate: Mon Jun 15 09:56:06 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java| 3 +++ 1 file changed, 3 insertions(+)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 4659cff59703458af8a817e17b176aaff1648445 Merge: 43cb781 8b234bd Author: Rohit Yadav AuthorDate: Fri Jun 12 10:38:30 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../kvm/resource/wrapper/LibvirtGetVolumeStatsCommandWrapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 43cb781d3b284993b107bde532f68e668a061df3 Merge: 50f0488 f433db9 Author: Rohit Yadav AuthorDate: Fri Jun 12 09:59:36 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 ui/l10n/pt_BR.js | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --cc ui/l10n/pt_BR.js index d3969a3,b3aacfb..eb5a290 --- a/ui/l10n/pt_BR.js +++ b/ui/l10n/pt_BR.js @@@ -1849,9 -1847,8 +1849,9 @@@ var dictionary = "message.action.delete.zone": "Confirme que você deseja remover esta Zona.", "message.action.destroy.instance": "Por favor, confirme que você deseja excluir esta Instância.", "message.action.destroy.systemvm": "Confirme que você deseja excluir esta VM de Sistema.", +"message.action.destroy.volume":"Please confirm that you want to destroy this volume.", "message.action.disable.cluster": "Confirma a desativação do cluster.", - "message.action.disable.nexusVswitch": "Por favor confirme que voc� deseja desabilitar este nexusVswitch", + "message.action.disable.nexusVswitch": "Por favor confirme que você deseja desabilitar este nexusVswitch", "message.action.disable.physical.network": "Por favor confirme que você deseja desabilitar esta rede física.", "message.action.disable.pod": "Confirma a desativação do POD.", "message.action.disable.static.NAT": "Confirme que você deseja desativar o NAT Estático.", @@@ -1872,9 -1869,8 +1872,9 @@@ "message.action.manage.cluster": "Confirma a vinculação do cluster.", "message.action.primarystorage.enable.maintenance.mode": "Aviso: Colocar o Storage primário em modo de Manutenção irá causar a parada de todas as VMs hospedadas nesta unidade. Deseja continuar?", "message.action.reboot.instance": "Por favor, confirme que você deseja reiniciar esta instância.", - "message.action.reboot.router": "Confirme que voc� deseja reiniciar este roteador.", + "message.action.reboot.router": "Confirme que você deseja reiniciar este roteador.", "message.action.reboot.systemvm": "Confirme que você deseja reiniciar esta VM de sistema.", +"message.action.recover.volume":"Please confirm that you would like to recover this volume.", "message.action.release.ip": "Confirme que você deseja liberar este IP.", "message.action.remove.host": "Favor confirmar que você deseja remover este host.", "message.action.reset.password.off": "Sua Instância não suporta esta funcionalidade.",
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 50f0488aaea8090c68dd7933edac90bcf67dd01c Merge: 5335971 851534a Author: Rohit Yadav AuthorDate: Tue Jun 9 08:29:39 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 533597171e31d9e7ce6cb69e4a4f4b9d06db0756 Merge: cd63d68 fef4458 Author: Rohit Yadav AuthorDate: Mon Jun 8 07:08:31 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../java/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit cd63d6812fe452d80a1be7843ee1a4c480cd376e Merge: debde60 056e676 Author: Rohit Yadav AuthorDate: Mon Jun 8 07:01:52 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../java/com/cloud/network/element/VirtualRouterElement.java | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit debde60c94de37f0a3811e7936323c5019610e00 Merge: db55910 23fa647 Author: Rohit Yadav AuthorDate: Thu Jun 4 08:22:58 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 scripts/vm/hypervisor/kvm/kvmvmactivity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit db2e2136ddf11dbc5dfb133008269930414203b3 Merge: 84bede2 2e3390f Author: Rohit Yadav AuthorDate: Wed Mar 25 12:54:21 2020 +0530 Merge remote-tracking branch 'origin/4.13' server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 36efbfcfd1db812dfbe2b005108f0d0a90170fcf Merge: 3575f5e cd6f0cb Author: Rohit Yadav AuthorDate: Mon Mar 16 15:28:39 2020 +0530 Merge remote-tracking branch 'origin/4.13' .../main/java/com/cloud/server/StatsCollector.java | 27 +++--- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 ++ .../java/com/cloud/server/StatsCollectorTest.java | 6 - 3 files changed, 15 insertions(+), 20 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit ba8fb61a3309c2cf99edf7b9b1d50133becfad86 Merge: 3ca5be4 79f7f0f Author: Rohit Yadav AuthorDate: Fri Feb 28 15:06:24 2020 +0530 Merge remote-tracking branch 'origin/4.13' server/src/main/java/com/cloud/server/ManagementServerImpl.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 3ca5be40d4c6b373f5de34b23534a132017966f1 Merge: a62a10c e8d418c Author: Rohit Yadav AuthorDate: Fri Feb 28 15:03:12 2020 +0530 Merge remote-tracking branch 'origin/4.13' .../network/element/VirtualRouterElement.java | 26 +- .../router/VirtualNetworkApplianceManagerImpl.java | 15 + systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 15 + 3 files changed, 37 insertions(+), 19 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 3950de116d61fb9605b1f2aa319fc88e07c17075 Merge: 4ab6b42 37d2b85 Author: Rohit Yadav AuthorDate: Wed Feb 19 13:13:04 2020 +0530 Merge remote-tracking branch 'origin/4.13' server/src/main/java/com/cloud/hypervisor/KVMGuru.java| 2 +- server/src/main/java/com/cloud/server/StatsCollector.java | 8 +--- 2 files changed, 2 insertions(+), 8 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit c01ce7b2b256000341173ffdca653e7f918c82d9 Merge: 8da0556 2496e53 Author: Rohit Yadav AuthorDate: Tue Sep 10 22:05:10 2019 +0530 Merge remote-tracking branch 'origin/4.13' python/lib/cloudutils/utilities.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
