You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2022/07/20 10:49:42 UTC
[cloudstack] branch 4.17 updated (2c05b63495 -> c4c4c71591)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 2c05b63495 kvm: Fix for Revert volume snapshot (#6527)
new 0899653ce8 cherry-pick b30a4a99d1b530efbf652373eda229f2cd5133b1
new c4c4c71591 cherry-pick ce7c3694c82232b5fa08f5a3fa8d5ff2b95542a3
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 1 +
plugins/storage/volume/storpool/pom.xml | 117 +++++++++++----------
2 files changed, 62 insertions(+), 56 deletions(-)
[cloudstack] 02/02: cherry-pick ce7c3694c82232b5fa08f5a3fa8d5ff2b95542a3
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c4c4c7159194b449b4e540961bdbd7243108e2cd
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Jul 20 16:18:32 2022 +0530
cherry-pick ce7c3694c82232b5fa08f5a3fa8d5ff2b95542a3
This fixes cherry-pick issue, while merging 4.17.0.1 on 4.17 branch
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
plugins/storage/volume/storpool/pom.xml | 117 +++++++++++++++++---------------
1 file changed, 61 insertions(+), 56 deletions(-)
diff --git a/plugins/storage/volume/storpool/pom.xml b/plugins/storage/volume/storpool/pom.xml
index b5f67d584e..d152f1e564 100644
--- a/plugins/storage/volume/storpool/pom.xml
+++ b/plugins/storage/volume/storpool/pom.xml
@@ -9,60 +9,65 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cloud-plugin-storage-volume-storpool</artifactId>
- <name>Apache CloudStack Plugin - Storage Volume StorPool provider</name>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloudstack-plugins</artifactId>
- <version>4.17.1.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-engine-storage-volume</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-engine-storage-snapshot</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-engine-orchestration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.4</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-plugin-storage-volume-storpool</artifactId>
+ <name>Apache CloudStack Plugin - Storage Volume StorPool provider</name>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack-plugins</artifactId>
+ <version>4.17.1.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-storage-volume</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-storage-snapshot</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-orchestration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${cs.reload4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[cloudstack] 01/02: cherry-pick b30a4a99d1b530efbf652373eda229f2cd5133b1
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0899653ce8e85623ffcc9a57ccda34bfd2e09152
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Jul 20 16:16:33 2022 +0530
cherry-pick b30a4a99d1b530efbf652373eda229f2cd5133b1
Somehow this was failed to be picked up by 4.17.0.1 merge on 4.17 branch
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
.../schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index e44cc33d6f..77de86e172 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -206,6 +206,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
.next("4.15.2.0", new Upgrade41520to41600())
.next("4.16.0.0", new Upgrade41600to41610())
.next("4.16.1.0", new Upgrade41610to41700())
+ .next("4.16.1.1", new Upgrade41610to41700())
.next("4.17.0.0", new Upgrade41700to41710())
.build();
}