From d895983d111086dd392a4bce257726b978465b43 Mon Sep 17 00:00:00 2001 From: Paul Angus Date: Tue, 25 Jun 2019 20:45:12 +0100 Subject: [PATCH 01/26] Updating pom.xml version numbers for release 4.11.3.0 Signed-off-by: Paul Angus --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a4fc002bbea..a7a774d2937 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloudstack (4.11.3.0) unstable; urgency=low + + * Update the version to 4.11.3.0 + + -- the Apache CloudStack project Tue, 25 Jun 2019 20:45:11 +0100 + cloudstack (4.11.3.0) unstable; urgency=low * Update the version to 4.11.3.0 From c160e7532aed9a85f7a1c12892c2e139a817cf54 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sat, 29 Jun 2019 00:23:36 +0530 Subject: [PATCH 02/26] ui: fix LB protocol bug (#3438) Fixes #3252 This fixes labels for missing LB protocol(s). Signed-off-by: Rohit Yadav --- ui/l10n/en.js | 1 + ui/scripts/network.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ui/l10n/en.js b/ui/l10n/en.js index aca4d998fbc..cd5f44de4d9 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -989,6 +989,7 @@ var dictionary = { "label.lb.protocol.http":"HTTP", "label.lb.protocol.ssl":"SSL", "label.lb.protocol.tcp":"TCP", +"label.lb.protocol.tcp.proxy":"TCP-proxy", "label.lb.protocol.udp":"UDP", "label.ldap.configuration":"LDAP Configuration", "label.ldap.group.name":"LDAP Group", diff --git a/ui/scripts/network.js b/ui/scripts/network.js index c1101cd0ca8..24a6c7dfc91 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3392,6 +3392,10 @@ id: 'tcp', name: 'tcp', description: _l('label.lb.protocol.tcp') + }, { + id: 'tcp-proxy', + name: 'tcp-proxy', + description: _l('label.lb.protocol.tcp.proxy') }, { id: 'udp', name: 'udp', From 58c18fc09ff7dfd3bd2c62c3e705fc8d21a2f55f Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sat, 29 Jun 2019 00:24:10 +0530 Subject: [PATCH 03/26] debian: install `file` as cloudstack-management dependency (#3436) This install `file` package that provides the `file` tool used by cloud-install-sys-tmplt script, as part of cloudstack-management package installation on Ubuntu distros. Signed-off-by: Rohit Yadav --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 32db7c0eb15..4e8742b4a2e 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C Package: cloudstack-management Architecture: all -Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, init-system-helpers (>= 1.14~) +Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, file, lsb-release, init-system-helpers (>= 1.14~) Conflicts: cloud-server, cloud-client, cloud-client-ui Description: CloudStack server library The CloudStack management server From 9ac32aae385457392aaa7dccd799624a669490e3 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Sat, 29 Jun 2019 08:39:36 +0200 Subject: [PATCH 04/26] server: VPC redundant vrs run on same hypervisor (#3421) For VPC supports redundant VRs, when start the second VR, the pod/cluster/host of first VR should be added to avoid list. This provides higher availability. The network VRs have the same process already. --- server/src/com/cloud/network/router/NetworkHelperImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/NetworkHelperImpl.java b/server/src/com/cloud/network/router/NetworkHelperImpl.java index fa17e7bc315..1262158c847 100644 --- a/server/src/com/cloud/network/router/NetworkHelperImpl.java +++ b/server/src/com/cloud/network/router/NetworkHelperImpl.java @@ -375,8 +375,13 @@ public class NetworkHelperImpl implements NetworkHelper { final List networkIds = _routerDao.getRouterNetworks(router.getId()); DomainRouterVO routerToBeAvoid = null; + List routerList = null; if (networkIds.size() != 0) { - final List routerList = _routerDao.findByNetwork(networkIds.get(0)); + routerList = _routerDao.findByNetwork(networkIds.get(0)); + } else if (router.getVpcId() != null) { + routerList = _routerDao.listByVpcId(router.getVpcId()); + } + if (routerList != null) { for (final DomainRouterVO rrouter : routerList) { if (rrouter.getHostId() != null && rrouter.getIsRedundantRouter() && rrouter.getState() == State.Running) { if (routerToBeAvoid != null) { From 2ecd5ec804a51978cde645a363bf334c5491c5db Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 1 Jul 2019 23:53:44 +0530 Subject: [PATCH 05/26] systemvm: don't fork to curl to save password (#3437) This fixes to avoid forking curl to save password but instead call a HTTP POST url directly within Python code. This may reduce bottleneck during high VM launches that require passwords. Fixes #3182 Signed-off-by: Rohit Yadav --- systemvm/debian/opt/cloud/bin/configure.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/configure.py b/systemvm/debian/opt/cloud/bin/configure.py index a7f297edbb2..0ddce52f885 100755 --- a/systemvm/debian/opt/cloud/bin/configure.py +++ b/systemvm/debian/opt/cloud/bin/configure.py @@ -21,6 +21,8 @@ import logging import os import re import sys +import urllib +import urllib2 import time from collections import OrderedDict @@ -62,10 +64,15 @@ class CsPassword(CsDataBag): server_ip = ip.split('/')[0] proc = CsProcess(['/opt/cloud/bin/passwd_server_ip.py', server_ip]) if proc.find(): - update_command = 'curl --header "DomU_Request: save_password" "http://{SERVER_IP}:8080/" -F "ip={VM_IP}" -F "password={PASSWORD}" ' \ - '-F "token={TOKEN}" >/dev/null 2>/dev/null &'.format(SERVER_IP=server_ip, VM_IP=vm_ip, PASSWORD=password, TOKEN=token) - result = CsHelper.execute(update_command) - logging.debug("Update password server result ==> %s" % result) + url = "http://%s:8080/" % server_ip + payload = {"ip": vm_ip, "password": password, "token": token} + data = urllib.urlencode(payload) + request = urllib2.Request(url, data=data, headers={"DomU_Request" : "save_password"}) + try: + resp = urllib2.urlopen(request, data) + logging.debug("Update password server result: http:%s, content:%s" % (resp.code, resp.read())) + except Exception as e: + logging.error("Failed to update password server due to: %s" % e) class CsAcl(CsDataBag): From 14bf2e98f362d077104b2cfe398af45d4be879fb Mon Sep 17 00:00:00 2001 From: Anurag Awasthi Date: Tue, 2 Jul 2019 12:51:44 +0530 Subject: [PATCH 06/26] ui: Don't pass account name when in project mode (#3435) When users try to list instances in project mode from Account > SSHKeyPairs > Key > View Instances, we don't need to include sshkeypairs account name into the API Param. It's redundant and causes error. Fixes #2895 --- ui/scripts/instances.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 0a89fdcb8f6..e108788aa67 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -750,9 +750,13 @@ if ("sshkeypairs" in args.context) { $.extend(data, { domainid: args.context.sshkeypairs[0].domainid, - account: args.context.sshkeypairs[0].account, keypair: args.context.sshkeypairs[0].name }); + if (!cloudStack.context || !cloudStack.context.projects) { + // In case we are in project mode sshkeypairs provides project account name which + // should not be passed as part of API params. So only extend if NOT in project mode. + $.extend(data, { account: args.context.sshkeypairs[0].account}); + } } $.ajax({ From 4185452366d5cb2f7c7ef6915a90b36ea5c14622 Mon Sep 17 00:00:00 2001 From: Anurag Awasthi Date: Tue, 2 Jul 2019 12:53:11 +0530 Subject: [PATCH 07/26] ui: Fix sorting bug in UI Code (#3445) Current master has sorting broken and the order reverses as opposed to what is set if sortkey.algorithm is set to true. The problem lies in the way the update APIs were being called by the UI. The code was agnostic to a global config that backend uses to set the order of the entities in the corresponding list APIs. We need to make UI aware of the global config and instead of changing sign of sort key pass proper numbers so that DB isn't confusing when some tables have positive sortkey and some have negative. The fix is in 2 steps- 1) Make use of sortkey name in place where it's relevant. Mere row index is not sufficient. 2) Reverse the sortkey if we are sorting by descending (when global config is false) --- ui/scripts/sharedFunctions.js | 2 +- ui/scripts/ui/widgets/listView.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 44623dce105..a8049ee886f 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -2419,7 +2419,7 @@ cloudStack.api = { url: createURL(updateCommand), data: { id: args.context[objType].id, - sortKey: g_sortKeyIsAscending ? (-1 * args.index) : args.index + sortKey: args.sortKey }, success: function(json) { args.response.success(); diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 25bdc062ee9..91578148e28 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -1335,13 +1335,18 @@ true, {}, $tr.closest('.list-view').data('view-args').context ); - var rowIndex = $tr.closest('tbody').find('tr').length - ($tr.index()); + var sortKey; + if (g_sortKeyIsAscending) { + sortKey = $tr.index() + 1; + } else { + sortKey = ($tr.closest('tbody').find('tr').length - ($tr.index())); + } context[viewArgs.activeSection] = $tr.data('json-obj'); action.action({ context: context, - index: rowIndex, + sortKey: sortKey, response: { success: function(args) {}, error: function(args) { From 047003315be799e6b12a8c3eeaf7f21da13f767e Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 2 Jul 2019 09:46:18 +0200 Subject: [PATCH 08/26] utils: reverse ip addresses of a nic returned by java to get the first ip address (#3449) Java methods getInterfaceAddresses() returns ip addresses in reverse order as "ip addr show" If there are multiple IPs assigned to a management interface, the last ip will be used as management ip in cloudstack. We need to reverse the ip addresses to get the first ip that makes more sense. Fixes #3311 --- utils/src/main/java/com/cloud/utils/net/NetUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java index dce6c257a1f..baddad2908c 100644 --- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java +++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java @@ -34,6 +34,7 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Formatter; import java.util.List; +import java.util.Collections; import java.util.Random; import java.util.Set; import java.util.SortedSet; @@ -410,10 +411,11 @@ public class NetUtils { } public static String[] getNetworkParams(final NetworkInterface nic) { - final List addrs = nic.getInterfaceAddresses(); + List addrs = nic.getInterfaceAddresses(); if (addrs == null || addrs.size() == 0) { return null; } + Collections.reverse(addrs); // reverse addresses because it has reverse order as "ip addr show" InterfaceAddress addr = null; for (final InterfaceAddress iaddr : addrs) { final InetAddress inet = iaddr.getAddress(); From 4c28a2bcaaa490a894fc82f60f558f3acdafe28a Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Tue, 2 Jul 2019 08:58:28 -0300 Subject: [PATCH 09/26] ui: Fix wrap text for accounts on project view (#3451) Fix wrap text for account names on the project view, as it cannot be fully displayed. --- ui/css/cloudstack3.css | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index c3d8061857a..a393ef7597b 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -8154,7 +8154,6 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal display: block; float: left; max-width: 90%; - white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } From 452b48ea0c59b99830701612d25def4ef020d63f Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 3 Jul 2019 08:11:53 +0200 Subject: [PATCH 10/26] server: reduce execution time while listing project if projects have many resource tags (#3306) If projects have many resource tags, it will take a long time to list projects. Remove resource tags information from project_view will fix it the issue. Fixes #3178 --- .../META-INF/db/schema-41200to41300.sql | 32 ++++++++- .../main/java/com/cloud/api/ApiDBUtils.java | 4 -- .../cloud/api/query/ViewResponseHelper.java | 5 +- .../cloud/api/query/dao/ProjectJoinDao.java | 2 - .../api/query/dao/ProjectJoinDaoImpl.java | 23 ++---- .../com/cloud/api/query/vo/ProjectJoinVO.java | 72 ------------------- 6 files changed, 36 insertions(+), 102 deletions(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41200to41300.sql b/engine/schema/src/main/resources/META-INF/db/schema-41200to41300.sql index 67b5f308041..5ffba48b7de 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41200to41300.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41200to41300.sql @@ -73,4 +73,34 @@ CREATE VIEW `cloud`.`data_center_view` AS left join `cloud`.`dedicated_resources` ON data_center.id = dedicated_resources.data_center_id left join - `cloud`.`affinity_group` ON dedicated_resources.affinity_group_id = affinity_group.id; \ No newline at end of file + `cloud`.`affinity_group` ON dedicated_resources.affinity_group_id = affinity_group.id; + +-- Remove key/value tags from project_view +DROP VIEW IF EXISTS `cloud`.`project_view`; +CREATE VIEW `cloud`.`project_view` AS + select + projects.id, + projects.uuid, + projects.name, + projects.display_text, + projects.state, + projects.removed, + projects.created, + projects.project_account_id, + account.account_name owner, + pacct.account_id, + domain.id domain_id, + domain.uuid domain_uuid, + domain.name domain_name, + domain.path domain_path + from + `cloud`.`projects` + inner join + `cloud`.`domain` ON projects.domain_id = domain.id + inner join + `cloud`.`project_account` ON projects.id = project_account.project_id + and project_account.account_role = 'Admin' + inner join + `cloud`.`account` ON account.id = project_account.account_id + left join + `cloud`.`project_account` pacct ON projects.id = pacct.project_id; diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java index 40ff827a9cd..535eaccaf82 100644 --- a/server/src/main/java/com/cloud/api/ApiDBUtils.java +++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java @@ -1771,10 +1771,6 @@ public class ApiDBUtils { return s_projectJoinDao.newProjectResponse(proj); } - public static ProjectResponse fillProjectDetails(ProjectResponse rsp, ProjectJoinVO proj) { - return s_projectJoinDao.setProjectResponse(rsp, proj); - } - public static List newProjectView(Project proj) { return s_projectJoinDao.newProjectView(proj); } diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java index 3ac9c8fa70f..cdc27c0d7bb 100644 --- a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java @@ -203,11 +203,8 @@ public class ViewResponseHelper { if (pData == null) { // first time encountering this vm pData = ApiDBUtils.newProjectResponse(p); - } else { - // update those 1 to many mapping fields - pData = ApiDBUtils.fillProjectDetails(pData, p); + prjDataList.put(p.getId(), pData); } - prjDataList.put(p.getId(), pData); } return new ArrayList(prjDataList.values()); } diff --git a/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDao.java index 9eeb8aa65f2..0142069c33f 100644 --- a/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDao.java +++ b/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDao.java @@ -28,8 +28,6 @@ public interface ProjectJoinDao extends GenericDao { ProjectResponse newProjectResponse(ProjectJoinVO proj); - ProjectResponse setProjectResponse(ProjectResponse rsp, ProjectJoinVO proj); - List newProjectView(Project proj); List searchByIds(Long... ids); diff --git a/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDaoImpl.java index 25598b35b27..970783b7920 100644 --- a/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/ProjectJoinDaoImpl.java @@ -32,6 +32,7 @@ import com.cloud.api.query.vo.AccountJoinVO; import com.cloud.api.query.vo.ProjectJoinVO; import com.cloud.api.query.vo.ResourceTagJoinVO; import com.cloud.projects.Project; +import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.user.Account; import com.cloud.user.dao.AccountDao; import com.cloud.utils.db.GenericDaoBase; @@ -81,12 +82,9 @@ public class ProjectJoinDaoImpl extends GenericDaoBase impl response.setOwner(proj.getOwner()); // update tag information - Long tag_id = proj.getTagId(); - if (tag_id != null && tag_id.longValue() > 0) { - ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); - if (vtag != null) { - response.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); - } + List tags = ApiDBUtils.listResourceTagViewByResourceUUID(proj.getUuid(), ResourceObjectType.Project); + for (ResourceTagJoinVO vtag : tags) { + response.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } //set resource limit/count information for the project (by getting the info of the project's account) @@ -99,19 +97,6 @@ public class ProjectJoinDaoImpl extends GenericDaoBase impl return response; } - @Override - public ProjectResponse setProjectResponse(ProjectResponse rsp, ProjectJoinVO proj) { - // update tag information - Long tag_id = proj.getTagId(); - if (tag_id != null && tag_id.longValue() > 0) { - ResourceTagJoinVO vtag = ApiDBUtils.findResourceTagViewById(tag_id); - if (vtag != null) { - rsp.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); - } - } - return rsp; - } - @Override public List newProjectView(Project proj) { SearchCriteria sc = prjIdSearch.create(); diff --git a/server/src/main/java/com/cloud/api/query/vo/ProjectJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ProjectJoinVO.java index 32488ff1b22..b17c9ff5915 100644 --- a/server/src/main/java/com/cloud/api/query/vo/ProjectJoinVO.java +++ b/server/src/main/java/com/cloud/api/query/vo/ProjectJoinVO.java @@ -29,7 +29,6 @@ import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; import com.cloud.projects.Project.State; -import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.utils.db.GenericDao; @Entity @@ -77,37 +76,6 @@ public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Ident @Column(name = "domain_path") private String domainPath; - @Column(name = "tag_id") - private long tagId; - - @Column(name = "tag_uuid") - private String tagUuid; - - @Column(name = "tag_key") - private String tagKey; - - @Column(name = "tag_value") - private String tagValue; - - @Column(name = "tag_domain_id") - private long tagDomainId; - - @Column(name = "tag_account_id") - private long tagAccountId; - - @Column(name = "tag_resource_id") - private long tagResourceId; - - @Column(name = "tag_resource_uuid") - private String tagResourceUuid; - - @Column(name = "tag_resource_type") - @Enumerated(value = EnumType.STRING) - private ResourceObjectType tagResourceType; - - @Column(name = "tag_customer") - private String tagCustomer; - @Column(name = "project_account_id") private long projectAccountId; @@ -164,46 +132,6 @@ public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Ident return owner; } - public long getTagId() { - return tagId; - } - - public String getTagUuid() { - return tagUuid; - } - - public String getTagKey() { - return tagKey; - } - - public String getTagValue() { - return tagValue; - } - - public long getTagDomainId() { - return tagDomainId; - } - - public long getTagAccountId() { - return tagAccountId; - } - - public long getTagResourceId() { - return tagResourceId; - } - - public String getTagResourceUuid() { - return tagResourceUuid; - } - - public ResourceObjectType getTagResourceType() { - return tagResourceType; - } - - public String getTagCustomer() { - return tagCustomer; - } - public long getAccountId() { return accountId; } From b72aadb65dbe88a52c1209f5b205889efc83b171 Mon Sep 17 00:00:00 2001 From: Paul Angus Date: Wed, 3 Jul 2019 09:28:09 +0100 Subject: [PATCH 11/26] Updating pom.xml version numbers for release 4.11.4.0-SNAPSHOT Signed-off-by: Paul Angus --- agent/pom.xml | 2 +- api/pom.xml | 2 +- client/pom.xml | 2 +- core/pom.xml | 2 +- debian/changelog | 12 ++++++------ developer/pom.xml | 2 +- engine/api/pom.xml | 2 +- engine/components-api/pom.xml | 2 +- engine/network/pom.xml | 2 +- engine/orchestration/pom.xml | 2 +- engine/pom.xml | 2 +- engine/schema/pom.xml | 2 +- engine/service/pom.xml | 2 +- engine/storage/cache/pom.xml | 2 +- engine/storage/configdrive/pom.xml | 2 +- engine/storage/datamotion/pom.xml | 2 +- engine/storage/image/pom.xml | 2 +- engine/storage/integration-test/pom.xml | 2 +- engine/storage/pom.xml | 2 +- engine/storage/snapshot/pom.xml | 2 +- engine/storage/volume/pom.xml | 2 +- framework/agent-lb/pom.xml | 2 +- framework/ca/pom.xml | 2 +- framework/cluster/pom.xml | 2 +- framework/config/pom.xml | 2 +- framework/db/pom.xml | 2 +- framework/direct-download/pom.xml | 2 +- framework/events/pom.xml | 2 +- framework/ipc/pom.xml | 2 +- framework/jobs/pom.xml | 2 +- framework/managed-context/pom.xml | 2 +- framework/pom.xml | 2 +- framework/quota/pom.xml | 2 +- framework/rest/pom.xml | 2 +- framework/security/pom.xml | 2 +- framework/spring/lifecycle/pom.xml | 2 +- framework/spring/module/pom.xml | 2 +- maven-standard/pom.xml | 2 +- plugins/acl/dynamic-role-based/pom.xml | 2 +- plugins/acl/static-role-based/pom.xml | 2 +- .../explicit-dedication/pom.xml | 2 +- .../affinity-group-processors/host-affinity/pom.xml | 2 +- .../host-anti-affinity/pom.xml | 2 +- plugins/alert-handlers/snmp-alerts/pom.xml | 2 +- plugins/alert-handlers/syslog-alerts/pom.xml | 2 +- plugins/api/discovery/pom.xml | 2 +- plugins/api/rate-limit/pom.xml | 2 +- plugins/api/solidfire-intg-test/pom.xml | 2 +- plugins/api/vmware-sioc/pom.xml | 2 +- plugins/ca/root-ca/pom.xml | 2 +- plugins/database/mysql-ha/pom.xml | 2 +- plugins/database/quota/pom.xml | 2 +- plugins/dedicated-resources/pom.xml | 2 +- .../deployment-planners/implicit-dedication/pom.xml | 2 +- .../user-concentrated-pod/pom.xml | 2 +- plugins/deployment-planners/user-dispersing/pom.xml | 2 +- plugins/event-bus/inmemory/pom.xml | 2 +- plugins/event-bus/kafka/pom.xml | 2 +- plugins/event-bus/rabbitmq/pom.xml | 2 +- plugins/file-systems/netapp/pom.xml | 2 +- plugins/ha-planners/skip-heurestics/pom.xml | 2 +- plugins/host-allocators/random/pom.xml | 2 +- plugins/hypervisors/baremetal/pom.xml | 2 +- plugins/hypervisors/hyperv/pom.xml | 2 +- plugins/hypervisors/kvm/pom.xml | 2 +- plugins/hypervisors/ovm/pom.xml | 2 +- plugins/hypervisors/ovm3/pom.xml | 2 +- plugins/hypervisors/simulator/pom.xml | 2 +- plugins/hypervisors/ucs/pom.xml | 2 +- plugins/hypervisors/vmware/pom.xml | 2 +- plugins/hypervisors/xenserver/pom.xml | 2 +- plugins/integrations/cloudian/pom.xml | 2 +- plugins/integrations/prometheus/pom.xml | 2 +- plugins/metrics/pom.xml | 2 +- plugins/network-elements/bigswitch/pom.xml | 2 +- plugins/network-elements/brocade-vcs/pom.xml | 2 +- plugins/network-elements/cisco-vnmc/pom.xml | 2 +- plugins/network-elements/dns-notifier/pom.xml | 2 +- .../network-elements/elastic-loadbalancer/pom.xml | 2 +- plugins/network-elements/f5/pom.xml | 2 +- plugins/network-elements/globodns/pom.xml | 2 +- .../network-elements/internal-loadbalancer/pom.xml | 2 +- plugins/network-elements/juniper-contrail/pom.xml | 2 +- plugins/network-elements/juniper-srx/pom.xml | 2 +- plugins/network-elements/netscaler/pom.xml | 2 +- plugins/network-elements/nicira-nvp/pom.xml | 4 ++-- plugins/network-elements/nuage-vsp/pom.xml | 2 +- plugins/network-elements/opendaylight/pom.xml | 2 +- plugins/network-elements/ovs/pom.xml | 2 +- plugins/network-elements/palo-alto/pom.xml | 2 +- plugins/network-elements/stratosphere-ssp/pom.xml | 2 +- plugins/network-elements/vxlan/pom.xml | 2 +- plugins/outofbandmanagement-drivers/ipmitool/pom.xml | 2 +- .../nested-cloudstack/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/storage-allocators/random/pom.xml | 2 +- plugins/storage/image/default/pom.xml | 2 +- plugins/storage/image/s3/pom.xml | 2 +- plugins/storage/image/sample/pom.xml | 2 +- plugins/storage/image/swift/pom.xml | 2 +- plugins/storage/volume/cloudbyte/pom.xml | 2 +- plugins/storage/volume/default/pom.xml | 2 +- plugins/storage/volume/nexenta/pom.xml | 2 +- plugins/storage/volume/sample/pom.xml | 2 +- plugins/storage/volume/solidfire/pom.xml | 2 +- plugins/user-authenticators/ldap/pom.xml | 2 +- plugins/user-authenticators/md5/pom.xml | 2 +- plugins/user-authenticators/pbkdf2/pom.xml | 2 +- plugins/user-authenticators/plain-text/pom.xml | 2 +- plugins/user-authenticators/saml2/pom.xml | 2 +- plugins/user-authenticators/sha256salted/pom.xml | 2 +- pom.xml | 2 +- quickcloud/pom.xml | 2 +- server/pom.xml | 2 +- services/console-proxy-rdp/rdpconsole/pom.xml | 2 +- services/console-proxy/plugin/pom.xml | 2 +- services/console-proxy/pom.xml | 2 +- services/console-proxy/server/pom.xml | 2 +- services/iam/plugin/pom.xml | 2 +- services/iam/server/pom.xml | 2 +- services/pom.xml | 2 +- services/secondary-storage/controller/pom.xml | 2 +- services/secondary-storage/pom.xml | 2 +- services/secondary-storage/server/pom.xml | 2 +- systemvm/pom.xml | 2 +- test/pom.xml | 2 +- tools/apidoc/pom.xml | 2 +- tools/checkstyle/pom.xml | 2 +- tools/devcloud-kvm/pom.xml | 2 +- tools/devcloud4/pom.xml | 2 +- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.centos6 | 6 +++--- tools/docker/Dockerfile.marvin | 4 ++-- tools/marvin/pom.xml | 2 +- tools/marvin/setup.py | 2 +- tools/pom.xml | 2 +- tools/wix-cloudstack-maven-plugin/pom.xml | 2 +- usage/pom.xml | 2 +- utils/pom.xml | 2 +- vmware-base/pom.xml | 2 +- 140 files changed, 149 insertions(+), 149 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index f84ccbccf42..fcad5b06546 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/api/pom.xml b/api/pom.xml index 9600acd3b9c..a57c0196fc1 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/client/pom.xml b/client/pom.xml index 51c06401e9c..5c142a5114b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 1a14f560568..7198a04b6ff 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/debian/changelog b/debian/changelog index a7a774d2937..aa71b34cb7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,18 @@ -cloudstack (4.11.3.0) unstable; urgency=low +cloudstack (4.11.4.0-SNAPSHOT) unstable; urgency=low - * Update the version to 4.11.3.0 + * Update the version to 4.11.4.0-SNAPSHOT -- the Apache CloudStack project Tue, 25 Jun 2019 20:45:11 +0100 -cloudstack (4.11.3.0) unstable; urgency=low +cloudstack (4.11.4.0-SNAPSHOT) unstable; urgency=low - * Update the version to 4.11.3.0 + * Update the version to 4.11.4.0-SNAPSHOT -- the Apache CloudStack project Mon, 10 Jun 2019 16:15:05 +0100 -cloudstack (4.11.3.0-SNAPSHOT) unstable; urgency=low +cloudstack (4.11.4.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low - * Update the version to 4.11.3.0-SNAPSHOT + * Update the version to 4.11.4.0-SNAPSHOT-SNAPSHOT -- the Apache CloudStack project Thu, 26 Jun 2018 18:24:36 +0100 diff --git a/developer/pom.xml b/developer/pom.xml index 4b137e4eb9f..a8ad817e1b3 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -18,7 +18,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 71732889e50..5624ab1665f 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml index 1fb235a9c89..1ecd3c78323 100644 --- a/engine/components-api/pom.xml +++ b/engine/components-api/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/network/pom.xml b/engine/network/pom.xml index ce9b9d6e844..7a8ce524965 100644 --- a/engine/network/pom.xml +++ b/engine/network/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml index 6a8ec66d2f0..2699cda6ab9 100755 --- a/engine/orchestration/pom.xml +++ b/engine/orchestration/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/pom.xml b/engine/pom.xml index 59994478102..caf561c88ef 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml index 65d2d038482..ab02646c9da 100644 --- a/engine/schema/pom.xml +++ b/engine/schema/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/service/pom.xml b/engine/service/pom.xml index fccb0b554b1..84d504c5e5c 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT cloud-engine-service war diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml index 5b405a89e96..3b20d0ab8ba 100644 --- a/engine/storage/cache/pom.xml +++ b/engine/storage/cache/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/configdrive/pom.xml b/engine/storage/configdrive/pom.xml index 9448e41f000..a965484b5b6 100644 --- a/engine/storage/configdrive/pom.xml +++ b/engine/storage/configdrive/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml index a654161ae8c..f62d14dfd31 100644 --- a/engine/storage/datamotion/pom.xml +++ b/engine/storage/datamotion/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml index 6bf3e37e376..420a3db5de2 100644 --- a/engine/storage/image/pom.xml +++ b/engine/storage/image/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index 7ff2b28fa91..692e6e9fd1b 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml index f482b9e6c36..1df21469192 100644 --- a/engine/storage/pom.xml +++ b/engine/storage/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml index 8dceb4bc39d..9e17abc86aa 100644 --- a/engine/storage/snapshot/pom.xml +++ b/engine/storage/snapshot/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml index 8f3f383903e..3c968fbe59a 100644 --- a/engine/storage/volume/pom.xml +++ b/engine/storage/volume/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-engine - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/framework/agent-lb/pom.xml b/framework/agent-lb/pom.xml index 2b65332c5db..13b8af2f2c7 100644 --- a/framework/agent-lb/pom.xml +++ b/framework/agent-lb/pom.xml @@ -25,7 +25,7 @@ cloudstack-framework org.apache.cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/ca/pom.xml b/framework/ca/pom.xml index d301377f8e1..96f78d4b794 100644 --- a/framework/ca/pom.xml +++ b/framework/ca/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml index 0116bf0efbe..5b955c4cd0d 100644 --- a/framework/cluster/pom.xml +++ b/framework/cluster/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/config/pom.xml b/framework/config/pom.xml index adf7e65e77a..03655d9fc4d 100644 --- a/framework/config/pom.xml +++ b/framework/config/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/db/pom.xml b/framework/db/pom.xml index b3953914516..d6674d877e7 100644 --- a/framework/db/pom.xml +++ b/framework/db/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/direct-download/pom.xml b/framework/direct-download/pom.xml index 4521c3da4e6..7f5c4cb6ef0 100644 --- a/framework/direct-download/pom.xml +++ b/framework/direct-download/pom.xml @@ -25,7 +25,7 @@ cloudstack-framework org.apache.cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml \ No newline at end of file diff --git a/framework/events/pom.xml b/framework/events/pom.xml index 9a1807bb530..7f054d8a20f 100644 --- a/framework/events/pom.xml +++ b/framework/events/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml index 9f7e4b3e6b8..9ed44f5170c 100644 --- a/framework/ipc/pom.xml +++ b/framework/ipc/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml index 3aa1554c13d..d4d4def6047 100644 --- a/framework/jobs/pom.xml +++ b/framework/jobs/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml index e5c75d05b01..c07c6ab9f69 100644 --- a/framework/managed-context/pom.xml +++ b/framework/managed-context/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../maven-standard/pom.xml diff --git a/framework/pom.xml b/framework/pom.xml index dc968299830..169c34de3e3 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT install diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml index 0d939e4dea6..d0d105daebf 100644 --- a/framework/quota/pom.xml +++ b/framework/quota/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 8425e4f4015..a6541552cb6 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -22,7 +22,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml cloud-framework-rest diff --git a/framework/security/pom.xml b/framework/security/pom.xml index a24cf38caa6..51b2235d5f0 100644 --- a/framework/security/pom.xml +++ b/framework/security/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-framework - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml index 7f4a3c0c8e6..48f7d73b5cf 100644 --- a/framework/spring/lifecycle/pom.xml +++ b/framework/spring/lifecycle/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../maven-standard/pom.xml diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml index 3da561ae66c..5ceff7978a6 100644 --- a/framework/spring/module/pom.xml +++ b/framework/spring/module/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../maven-standard/pom.xml diff --git a/maven-standard/pom.xml b/maven-standard/pom.xml index 226a80a6ba8..a215756fa9f 100644 --- a/maven-standard/pom.xml +++ b/maven-standard/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/plugins/acl/dynamic-role-based/pom.xml b/plugins/acl/dynamic-role-based/pom.xml index 1a7d4016a80..bb796e14fed 100644 --- a/plugins/acl/dynamic-role-based/pom.xml +++ b/plugins/acl/dynamic-role-based/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/acl/static-role-based/pom.xml b/plugins/acl/static-role-based/pom.xml index ec35b052c66..5a03d9a993a 100644 --- a/plugins/acl/static-role-based/pom.xml +++ b/plugins/acl/static-role-based/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml index bbf6a503e74..578691bda37 100644 --- a/plugins/affinity-group-processors/explicit-dedication/pom.xml +++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/affinity-group-processors/host-affinity/pom.xml b/plugins/affinity-group-processors/host-affinity/pom.xml index a2a4f7e5f90..38d11e01943 100644 --- a/plugins/affinity-group-processors/host-affinity/pom.xml +++ b/plugins/affinity-group-processors/host-affinity/pom.xml @@ -23,7 +23,7 @@ cloudstack-plugins org.apache.cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml index 6f172361308..de4c6652c24 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml +++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml index 73bcd7fdbee..0b570aedfb9 100644 --- a/plugins/alert-handlers/snmp-alerts/pom.xml +++ b/plugins/alert-handlers/snmp-alerts/pom.xml @@ -22,7 +22,7 @@ cloudstack-plugins org.apache.cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml index 88243cf17e5..6a230bb7482 100644 --- a/plugins/alert-handlers/syslog-alerts/pom.xml +++ b/plugins/alert-handlers/syslog-alerts/pom.xml @@ -22,7 +22,7 @@ cloudstack-plugins org.apache.cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml index 9d63250ad4d..042275500d4 100644 --- a/plugins/api/discovery/pom.xml +++ b/plugins/api/discovery/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml index dcb5dc1ef07..88283b33170 100644 --- a/plugins/api/rate-limit/pom.xml +++ b/plugins/api/rate-limit/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml index b98947cd274..47de6b37f13 100644 --- a/plugins/api/solidfire-intg-test/pom.xml +++ b/plugins/api/solidfire-intg-test/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/api/vmware-sioc/pom.xml b/plugins/api/vmware-sioc/pom.xml index c2862eae9d3..cc61d24ce8d 100644 --- a/plugins/api/vmware-sioc/pom.xml +++ b/plugins/api/vmware-sioc/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/ca/root-ca/pom.xml b/plugins/ca/root-ca/pom.xml index aa6743ba861..645632e974d 100644 --- a/plugins/ca/root-ca/pom.xml +++ b/plugins/ca/root-ca/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml index 5a997842edb..d68b64cadfc 100644 --- a/plugins/database/mysql-ha/pom.xml +++ b/plugins/database/mysql-ha/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/database/quota/pom.xml b/plugins/database/quota/pom.xml index cfad62f4932..17b1feb97c6 100644 --- a/plugins/database/quota/pom.xml +++ b/plugins/database/quota/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/dedicated-resources/pom.xml b/plugins/dedicated-resources/pom.xml index bd481e51f1f..3e8aa560b3a 100644 --- a/plugins/dedicated-resources/pom.xml +++ b/plugins/dedicated-resources/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/plugins/deployment-planners/implicit-dedication/pom.xml b/plugins/deployment-planners/implicit-dedication/pom.xml index 40791f9212f..13b22516962 100644 --- a/plugins/deployment-planners/implicit-dedication/pom.xml +++ b/plugins/deployment-planners/implicit-dedication/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml index dfa30757446..a4529136364 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml index 377de41abbe..b79068eb62a 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/event-bus/inmemory/pom.xml b/plugins/event-bus/inmemory/pom.xml index 9deb58dbf14..bc6e6687941 100644 --- a/plugins/event-bus/inmemory/pom.xml +++ b/plugins/event-bus/inmemory/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml index f5bda13ce32..f72c6933162 100644 --- a/plugins/event-bus/kafka/pom.xml +++ b/plugins/event-bus/kafka/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index d61d5bb1e72..4741b0140e8 100644 --- a/plugins/event-bus/rabbitmq/pom.xml +++ b/plugins/event-bus/rabbitmq/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml index c88816e3f1b..13f8c6696ef 100644 --- a/plugins/file-systems/netapp/pom.xml +++ b/plugins/file-systems/netapp/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/ha-planners/skip-heurestics/pom.xml b/plugins/ha-planners/skip-heurestics/pom.xml index 3ec94fded57..04b3a7805bd 100644 --- a/plugins/ha-planners/skip-heurestics/pom.xml +++ b/plugins/ha-planners/skip-heurestics/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index 1f7db32f7cb..2032e02a459 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/baremetal/pom.xml b/plugins/hypervisors/baremetal/pom.xml index ccb271962a4..5c7af1bbaa4 100755 --- a/plugins/hypervisors/baremetal/pom.xml +++ b/plugins/hypervisors/baremetal/pom.xml @@ -21,7 +21,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml cloud-plugin-hypervisor-baremetal diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index 35ae7a515cb..02e31de3a2e 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 01ccdd70091..3cf3d87ab9e 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index fe31daa3477..b73e473ed1c 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml index 029034b2849..667f663df18 100644 --- a/plugins/hypervisors/ovm3/pom.xml +++ b/plugins/hypervisors/ovm3/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml index b75d877958b..ff79e7d0017 100644 --- a/plugins/hypervisors/simulator/pom.xml +++ b/plugins/hypervisors/simulator/pom.xml @@ -22,7 +22,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml cloud-plugin-hypervisor-simulator diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml index 7bfa6915375..4f1f136ad0f 100755 --- a/plugins/hypervisors/ucs/pom.xml +++ b/plugins/hypervisors/ucs/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml cloud-plugin-hypervisor-ucs diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index a09014a61e4..571720f1264 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/xenserver/pom.xml b/plugins/hypervisors/xenserver/pom.xml index f999137dd23..0ed98245135 100644 --- a/plugins/hypervisors/xenserver/pom.xml +++ b/plugins/hypervisors/xenserver/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/integrations/cloudian/pom.xml b/plugins/integrations/cloudian/pom.xml index c4624a75d2d..2f95b311c7a 100644 --- a/plugins/integrations/cloudian/pom.xml +++ b/plugins/integrations/cloudian/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/integrations/prometheus/pom.xml b/plugins/integrations/prometheus/pom.xml index 8a8a3ef4f0f..2d7e110ef71 100644 --- a/plugins/integrations/prometheus/pom.xml +++ b/plugins/integrations/prometheus/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/metrics/pom.xml b/plugins/metrics/pom.xml index 981a026bd4b..ff3ee6eaabd 100644 --- a/plugins/metrics/pom.xml +++ b/plugins/metrics/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/plugins/network-elements/bigswitch/pom.xml b/plugins/network-elements/bigswitch/pom.xml index 28ba2f2ebd0..51dd6acda8c 100644 --- a/plugins/network-elements/bigswitch/pom.xml +++ b/plugins/network-elements/bigswitch/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml index dd99440e511..9a24c875310 100644 --- a/plugins/network-elements/brocade-vcs/pom.xml +++ b/plugins/network-elements/brocade-vcs/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml index 8433b761365..e3bc8bcb8e2 100644 --- a/plugins/network-elements/cisco-vnmc/pom.xml +++ b/plugins/network-elements/cisco-vnmc/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml index 5cd4e585225..90ceb5e0ce7 100644 --- a/plugins/network-elements/dns-notifier/pom.xml +++ b/plugins/network-elements/dns-notifier/pom.xml @@ -22,7 +22,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml cloud-plugin-example-dns-notifier diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml index 94f011294e1..b355e575058 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index 1dcf7a02b62..bc2e09ded5a 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml index c6977587fee..afbcb558f6d 100644 --- a/plugins/network-elements/globodns/pom.xml +++ b/plugins/network-elements/globodns/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml index 1860e318013..a07da430af4 100644 --- a/plugins/network-elements/internal-loadbalancer/pom.xml +++ b/plugins/network-elements/internal-loadbalancer/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index 0bbdf24635e..46900fe6da1 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index 1c0734e84dc..0c31365558e 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 31b5ce410d5..a1bc19fcb60 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index fbfcb3c99b7..e7cd0ae4032 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml @@ -34,7 +34,7 @@ org.apache.cloudstack cloud-utils - 4.11.3.0 + 4.11.4.0-SNAPSHOT test-jar test diff --git a/plugins/network-elements/nuage-vsp/pom.xml b/plugins/network-elements/nuage-vsp/pom.xml index 123f998040e..7195e3296af 100644 --- a/plugins/network-elements/nuage-vsp/pom.xml +++ b/plugins/network-elements/nuage-vsp/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml index 8825bf5aa2f..a650b1242c3 100644 --- a/plugins/network-elements/opendaylight/pom.xml +++ b/plugins/network-elements/opendaylight/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index b920e5fa38b..3807ab592b8 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/palo-alto/pom.xml b/plugins/network-elements/palo-alto/pom.xml index 9c780984ddb..84e8a79480e 100644 --- a/plugins/network-elements/palo-alto/pom.xml +++ b/plugins/network-elements/palo-alto/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/stratosphere-ssp/pom.xml b/plugins/network-elements/stratosphere-ssp/pom.xml index f17bc959fca..788b9674502 100644 --- a/plugins/network-elements/stratosphere-ssp/pom.xml +++ b/plugins/network-elements/stratosphere-ssp/pom.xml @@ -25,7 +25,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/vxlan/pom.xml b/plugins/network-elements/vxlan/pom.xml index 57ad32064c8..24f69036f86 100644 --- a/plugins/network-elements/vxlan/pom.xml +++ b/plugins/network-elements/vxlan/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml index d80f42708d8..44e1316c1db 100644 --- a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml +++ b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml index acdca8509b2..0ae1250d5b3 100644 --- a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml +++ b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 5ca1a63b167..8aaae7ac839 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index 605e90bf417..990321745c5 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/storage/image/default/pom.xml b/plugins/storage/image/default/pom.xml index e1149c40c07..b6d9dce99e8 100644 --- a/plugins/storage/image/default/pom.xml +++ b/plugins/storage/image/default/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/image/s3/pom.xml b/plugins/storage/image/s3/pom.xml index e9fe4d475ee..287d94134c2 100644 --- a/plugins/storage/image/s3/pom.xml +++ b/plugins/storage/image/s3/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/image/sample/pom.xml b/plugins/storage/image/sample/pom.xml index b37fd2b9e6e..25f443913b4 100644 --- a/plugins/storage/image/sample/pom.xml +++ b/plugins/storage/image/sample/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/image/swift/pom.xml b/plugins/storage/image/swift/pom.xml index e964fccab30..3508ef1a406 100644 --- a/plugins/storage/image/swift/pom.xml +++ b/plugins/storage/image/swift/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index 0ba61df970d..34b03031a57 100755 --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/default/pom.xml b/plugins/storage/volume/default/pom.xml index e837a0cc322..e7383c9a65d 100644 --- a/plugins/storage/volume/default/pom.xml +++ b/plugins/storage/volume/default/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/nexenta/pom.xml b/plugins/storage/volume/nexenta/pom.xml index 5bff3cde149..591a5e68eb9 100644 --- a/plugins/storage/volume/nexenta/pom.xml +++ b/plugins/storage/volume/nexenta/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/sample/pom.xml b/plugins/storage/volume/sample/pom.xml index 020fb4805b6..9bbfd65e0f6 100644 --- a/plugins/storage/volume/sample/pom.xml +++ b/plugins/storage/volume/sample/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index 9d6c24bf828..46c50e6a980 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../../pom.xml diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index f9ef70229e6..aae36becf7d 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index 4f16d28e0a5..e9df596839a 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/pbkdf2/pom.xml b/plugins/user-authenticators/pbkdf2/pom.xml index 7ffd8e8ab1e..58eaf748cf8 100644 --- a/plugins/user-authenticators/pbkdf2/pom.xml +++ b/plugins/user-authenticators/pbkdf2/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml index bffcba5c03f..e0d075056fd 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml index bd78a882920..1a86f22a544 100644 --- a/plugins/user-authenticators/saml2/pom.xml +++ b/plugins/user-authenticators/saml2/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/sha256salted/pom.xml b/plugins/user-authenticators/sha256salted/pom.xml index 90586facfc3..9d09ca632c6 100644 --- a/plugins/user-authenticators/sha256salted/pom.xml +++ b/plugins/user-authenticators/sha256salted/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-plugins - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index f3a2e6d0c8c..777aa1e1b6c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT pom Apache CloudStack Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration platform. diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml index b3b4634adb6..0b29e11edbf 100644 --- a/quickcloud/pom.xml +++ b/quickcloud/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloud-maven-standard - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../maven-standard/pom.xml diff --git a/server/pom.xml b/server/pom.xml index dad75767753..3824ee5113a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml index 6030b0d4842..da2e50ee194 100755 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ b/services/console-proxy-rdp/rdpconsole/pom.xml @@ -27,7 +27,7 @@ org.apache.cloudstack cloudstack-services - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/services/console-proxy/plugin/pom.xml b/services/console-proxy/plugin/pom.xml index 90a105901a7..1417a73181c 100644 --- a/services/console-proxy/plugin/pom.xml +++ b/services/console-proxy/plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-console-proxy - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/console-proxy/pom.xml b/services/console-proxy/pom.xml index f93fb16b062..d14203f0e5c 100644 --- a/services/console-proxy/pom.xml +++ b/services/console-proxy/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-services - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 9773b37aa4a..012452b668b 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-console-proxy - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/iam/plugin/pom.xml b/services/iam/plugin/pom.xml index 096a7cd2d2a..6efef060f30 100644 --- a/services/iam/plugin/pom.xml +++ b/services/iam/plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-iam - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml index 64f945c365a..8711fe5a722 100644 --- a/services/iam/server/pom.xml +++ b/services/iam/server/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-iam - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/pom.xml b/services/pom.xml index 02ae153cd74..9845a00f086 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/secondary-storage/controller/pom.xml b/services/secondary-storage/controller/pom.xml index 3337e2f622a..1c07ef45aa2 100644 --- a/services/secondary-storage/controller/pom.xml +++ b/services/secondary-storage/controller/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-secondary-storage - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index 52207a4a8df..19666505153 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack-services - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml index 95bbc742bca..df778cc6749 100644 --- a/services/secondary-storage/server/pom.xml +++ b/services/secondary-storage/server/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack-service-secondary-storage - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/systemvm/pom.xml b/systemvm/pom.xml index 0f1bbb8f9a2..e42c15434c3 100644 --- a/systemvm/pom.xml +++ b/systemvm/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 4614f49916c..2fff029825b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -23,7 +23,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index 3e3d0834b86..d6b7b69a016 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloud-tools - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml index 65e7da0231a..b8143adc663 100644 --- a/tools/checkstyle/pom.xml +++ b/tools/checkstyle/pom.xml @@ -24,7 +24,7 @@ Apache CloudStack Developer Tools - Checkstyle Configuration org.apache.cloudstack checkstyle - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml index f372651b2e1..bea58ff7ae6 100644 --- a/tools/devcloud-kvm/pom.xml +++ b/tools/devcloud-kvm/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloud-tools - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/tools/devcloud4/pom.xml b/tools/devcloud4/pom.xml index 75883c813c0..7058ecbfbaf 100644 --- a/tools/devcloud4/pom.xml +++ b/tools/devcloud4/pom.xml @@ -17,7 +17,7 @@ org.apache.cloudstack cloud-tools - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 34a71a8587a..8a9c1d271d5 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:16.04 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.3.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.4.0-SNAPSHOT" RUN apt-get -y update && apt-get install -y \ genisoimage \ diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6 index 5156b9cfd9b..326c7fd2826 100644 --- a/tools/docker/Dockerfile.centos6 +++ b/tools/docker/Dockerfile.centos6 @@ -18,7 +18,7 @@ FROM centos:6 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.3.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.4.0-SNAPSHOT" ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64 @@ -26,8 +26,8 @@ ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessf RUN rpm -i http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.3-1.el6.x86_64.rpm RUN yum install -y nc wget \ - ${PKG_URL}/cloudstack-common-4.11.3.0.el6.x86_64.rpm \ - ${PKG_URL}/cloudstack-management-4.11.3.0.el6.x86_64.rpm + ${PKG_URL}/cloudstack-common-4.11.4.0-SNAPSHOT.el6.x86_64.rpm \ + ${PKG_URL}/cloudstack-management-4.11.4.0-SNAPSHOT.el6.x86_64.rpm RUN cd /etc/cloudstack/management; \ ln -s tomcat6-nonssl.conf tomcat6.conf; \ diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin index 9495fce3002..33ae40c01f9 100644 --- a/tools/docker/Dockerfile.marvin +++ b/tools/docker/Dockerfile.marvin @@ -20,11 +20,11 @@ FROM python:2 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.3.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.11.4.0-SNAPSHOT" ENV WORK_DIR=/marvin -ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.3.0.tar.gz +ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.11.4.0-SNAPSHOT.tar.gz RUN apt-get update && apt-get install -y vim RUN pip install --upgrade paramiko nose requests diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml index f728dba7dcc..75a1f8c9535 100644 --- a/tools/marvin/pom.xml +++ b/tools/marvin/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloud-tools - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index d41a7c05917..8f743ba50e8 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -27,7 +27,7 @@ except ImportError: raise RuntimeError("python setuptools is required to build Marvin") -VERSION = "4.11.3.0" +VERSION = "4.11.4.0-SNAPSHOT" setup(name="Marvin", version=VERSION, diff --git a/tools/pom.xml b/tools/pom.xml index c5feb4066d9..d91bd801303 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -27,7 +27,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/tools/wix-cloudstack-maven-plugin/pom.xml b/tools/wix-cloudstack-maven-plugin/pom.xml index dc7ed433e0b..6eb20520b09 100644 --- a/tools/wix-cloudstack-maven-plugin/pom.xml +++ b/tools/wix-cloudstack-maven-plugin/pom.xml @@ -16,7 +16,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../../pom.xml diff --git a/usage/pom.xml b/usage/pom.xml index f56b070eb5d..429da5eae39 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -15,7 +15,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT diff --git a/utils/pom.xml b/utils/pom.xml index fc86f26f053..923163b6e87 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -26,7 +26,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT ../pom.xml diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 8cd3a5aaa28..2c7cc1d7c8d 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.11.3.0 + 4.11.4.0-SNAPSHOT From f3aa147806adf2b14b8999329652302844629dca Mon Sep 17 00:00:00 2001 From: smlshn Date: Thu, 4 Jul 2019 11:59:17 +0300 Subject: [PATCH 12/26] ui: sort list of templates, serviceOfferings, diskOfferings etc in the deploy VM wizard (#3336) Adds functionality to sort the data that is available on each in the deploy VM wizard's step by their suitable fields: affinityGroups by name sshkeyPairs by name vpcs by name Fixes: #3050 --- ui/scripts/sharedFunctions.js | 33 ++++++++++++++++++++++++++ ui/scripts/ui-custom/instanceWizard.js | 9 +++++++ 2 files changed, 42 insertions(+) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index a8049ee886f..d4a06e3228e 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -2557,6 +2557,39 @@ function strOrFunc(arg, args) { return arg; } +function sortArrayByKey(arrayToSort, sortKey, reverse) { + + if(!arrayToSort){ + return; + } + // Move smaller items towards the front + // or back of the array depending on if + // we want to sort the array in reverse + // order or not. + var moveSmaller = reverse ? 1 : -1; + + // Move larger items towards the front + // or back of the array depending on if + // we want to sort the array in reverse + // order or not. + var moveLarger = reverse ? -1 : 1; + + /** + * @param {*} a + * @param {*} b + * @return {Number} + */ + arrayToSort.sort(function(a, b) { + if (a[sortKey] < b[sortKey]) { + return moveSmaller; + } + if (a[sortKey] > b[sortKey]) { + return moveLarger; + } + return 0; + }); +} + $.validator.addMethod("netmask", function(value, element) { if (this.optional(element) && value.length == 0) return true; diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index 706c0bfa4b5..ef6d2246c47 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -809,6 +809,9 @@ $step.find('.main-desc, p.no-affinity-groups').remove(); if (args.data.affinityGroups && args.data.affinityGroups.length) { + + sortArrayByKey(args.data.affinityGroups, 'name'); + $step.prepend( $('
').addClass('main-desc').append( $('

').html(_l('message.select.affinity.groups')) @@ -855,6 +858,9 @@ $step.find('.main-desc, p.no-sshkey-pairs').remove(); if (args.data.sshkeyPairs && args.data.sshkeyPairs.length) { + + sortArrayByKey(args.data.sshkeyPairs, 'name'); + $step.prepend( $('

').addClass('main-desc').append( $('

').html(_l('message.please.select.ssh.key.pair.use.with.this.vm')) @@ -1024,6 +1030,9 @@ // Populate VPC drop-down $vpcSelect.html(''); + + sortArrayByKey(vpcs, 'name'); + $(vpcs).map(function(index, vpc) { var $option = $('