Skip to content

Commit 5f1382f

Browse files
SadiJrSadiJr
authored
Merge branch 'apache:main' into main
2 parents 860097c + e27dd53 commit 5f1382f

File tree

161 files changed

+537
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+537
-293
lines changed

‎agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.16.0.0-SNAPSHOT</version>
27+
<version>4.17.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.16.0.0-SNAPSHOT</version>
27+
<version>4.17.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.command.admin.vm;
1818

19-
import org.apache.log4j.Logger;
20-
2119
import org.apache.cloudstack.api.APICommand;
2220
import org.apache.cloudstack.api.ApiConstants;
2321
import org.apache.cloudstack.api.Parameter;
2422
import org.apache.cloudstack.api.ResponseObject.ResponseView;
2523
import org.apache.cloudstack.api.command.admin.AdminCmd;
2624
import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
25+
import org.apache.cloudstack.api.response.ClusterResponse;
2726
import org.apache.cloudstack.api.response.HostResponse;
2827
import org.apache.cloudstack.api.response.PodResponse;
2928
import org.apache.cloudstack.api.response.StoragePoolResponse;
3029
import org.apache.cloudstack.api.response.UserVmResponse;
30+
import org.apache.log4j.Logger;
3131

3232
import com.cloud.vm.VirtualMachine;
3333

@@ -52,6 +52,10 @@ public class ListVMsCmdByAdmin extends ListVMsCmd implements AdminCmd {
5252
description="the storage ID where vm's volumes belong to")
5353
private Long storageId;
5454

55+
@Parameter(name = ApiConstants.CLUSTER_ID, type = CommandType.UUID, entityType = ClusterResponse.class,
56+
description = "the cluster ID", since = "4.16.0")
57+
private Long clusterId;
58+
5559

5660
/////////////////////////////////////////////////////
5761
/////////////////// Accessors ///////////////////////
@@ -69,4 +73,7 @@ public Long getStorageId() {
6973
return storageId;
7074
}
7175

76+
public Long getClusterId() {
77+
return clusterId;
78+
}
7279
}

‎client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.apache.cloudstack</groupId>
2727
<artifactId>cloudstack</artifactId>
28-
<version>4.16.0.0-SNAPSHOT</version>
28+
<version>4.17.0.0-SNAPSHOT</version>
2929
</parent>
3030
<repositories>
3131
<repository>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.16.0.0-SNAPSHOT</version>
27+
<version>4.17.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎debian/changelog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
cloudstack (4.17.0.0-SNAPSHOT) unstable; urgency=low
2+
3+
* Update the version to 4.17.0.0-SNAPSHOT
4+
5+
-- the Apache CloudStack project <dev@cloudstack.apache.org> Wed, 10 Nov 2021 12:31:57 -0300
6+
7+
cloudstack (4.16.0.0) unstable; urgency=low
8+
9+
* Update the version to 4.16.0.0
10+
11+
-- the Apache CloudStack project <dev@cloudstack.apache.org> Thu, 04 Nov 2021 14:14:57 -0300
12+
113
cloudstack (4.16.0.0-SNAPSHOT) unstable; urgency=low
214

315
* Update the version to 4.16.0.0-SNAPSHOT

‎developer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.apache.cloudstack</groupId>
2727
<artifactId>cloudstack</artifactId>
28-
<version>4.16.0.0-SNAPSHOT</version>
28+
<version>4.17.0.0-SNAPSHOT</version>
2929
</parent>
3030
<dependencies>
3131
<dependency>

‎engine/api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-engine</artifactId>
27-
<version>4.16.0.0-SNAPSHOT</version>
27+
<version>4.17.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎engine/components-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-engine</artifactId>
27-
<version>4.16.0.0-SNAPSHOT</version>
27+
<version>4.17.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

‎engine/network/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloud-engine</artifactId>
27-
<version>4.16.0.0-SNAPSHOT</version>
27+
<version>4.17.0.0-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030
<dependencies>

0 commit comments

Comments
 (0)