[4.9/LTS] Add upgrade path from 4.9.0 to 4.9.1, change version to 4.9.1.0-SNAPSHOT #1646
Conversation
|
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. |
|
Packaging result: ✔centos6 ✔centos7 ✔debian repo: http://packages.shapeblue.com/cloudstack/pr/1646 |
|
@rhtyd we are moving to four position to version numbers to support our recent security release change where the fourth position is used to reflect security patch. Therefore, the release schedule designates the next release as 4.9.1.0. Could you please update the POMs to reflect the fourth position? We also need this change made for master (4.10.0.0) and 4.8 (4.8.2.0). |
- Adds db upgrade path from 4.9.0 to 4.9.1 - CLOUDSTACK-9449: Fix typo in default user role description Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
c2512b6 to
f13c224
Compare
|
@blueorangutan package |
|
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. |
|
Packaging result: ✔centos6 ✔centos7 ✔debian repo: http://packages.shapeblue.com/cloudstack/pr/1646 |
|
@rhtyd could you please squash the commits? |
|
@jburwell I've kept the changes into two commits (1) for pom.xml related version changes and (2) for db upgrade path, as when doing fwd-merging this will cause conflict with other pom files so on fwd-merging we can use a merging strategy to pick changes on (ours) master for the pom related changes while take the db upgrade path changes. I'll further require to fix the upgrade path on master branch to be like --> 4.9.0->4.9.1(.0)->4.10.0(.0) which is right now set as 4.9.0->4.10.0. I can also help with doing the fwd-merging so you can avoid dealing with the conflicts yourself. |
|
@rhtyd I understand the reasoning for two commits, and it makes sense. Since you understand the process required for the forward merge, I think it makes sense for you to perform it. LGTM for code. This PR is a blocker for cutting the 4.9.1.0 release candidate. @karuturi @swill @wido are you able to provide a test LGTM? blueorangutan built packages successfully. I think simply doing a |
|
code LGTM |
|
@jburwell yes that and we can also verify from packages that the version is reflected in the pkg names. |
|
Given we've enough reviews and tests (Travis) passing, I'll go ahead merge this and merge this fwd to master. |
[4.9/LTS] Add upgrade path from 4.9.0 to 4.9.1, change version to 4.9.1.0-SNAPSHOTThis adds db upgrade path from 4.9.0 to 4.9.1 and fixes a typo in default user role description (CLOUDSTACK-9449) /cc @karuturi @jburwell -- this will cause issues when fwd-merged to master, I can do the fwd-merging if you would like to avoid fixing the conflicts yourself @blueorangutan package * pr/1646: Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT cloudstack: upgrade path from 4.9.0 to 4.9.1 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
|
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. |
|
Packaging result: ✔centos6 ✔centos7 ✔debian repo: http://packages.shapeblue.com/cloudstack/pr/1646 |
|
Fwd-merged this to master, with db version on master fixed during merge conflict to 4.10.0.0-SNAPSHOT, and db paths fixed as 4.9.0->4.9.1->4.10.0. |
This adds db upgrade path from 4.9.0 to 4.9.1 and fixes a typo in default user role description (CLOUDSTACK-9449)
/cc @karuturi @jburwell -- this will cause issues when fwd-merged to master, I can do the fwd-merging if you would like to avoid fixing the conflicts yourself
@blueorangutan package