Merge 4.6 release branch to master #1071
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Remi Bergsma <github@remi.nl>
Signed-off-by: Remi Bergsma <github@remi.nl>
implement upgrade path from 4.6.0 to 4.6.1The 4.6 branch needs an upgrade path to 4.6.1. I looked at how this was done before and think this will do. Can you give it a second pair of eyes please @DaanHoogland ? When this is indeed OK, I'll do the same for master for the 4.6.0 -> 4.7.0 path. I've tried a build and that works: `mvn clean install` ``` [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 07:33 min [INFO] Finished at: 2015-11-15T13:45:58+01:00 [INFO] Final Memory: 120M/1591M [INFO] ------------------------------------------------------------------------ ``` Once this is a PR, I'll try an actual upgrade from 4.6.0 to 4.6.1-SNAPSHOT. * pr/1067: implemented upgrade path from 4.6.0 to 4.6.1 Signed-off-by: Remi Bergsma <github@remi.nl>
* 4.6: more poms didn't get updated with script implemented upgrade path from 4.6.0 to 4.6.1 checkstyle pom didn't get updated with script debian: add 4.6.1-snapshot to changelog Updating pom.xml version numbers for release 4.6.1-SNAPSHOT Updating pom.xml version numbers for release 4.6.0
build/replace.properties
Outdated
Contributor
|
Thanks @karuturi will give it a test-drive soon! |
Contributor
|
LGTM: Result: And: Result: |
Contributor
|
@DaanHoogland @wilderrodrigues @miguelaferreira Can either of you review so we can merge this and open master for new features? |
Contributor
|
Hi @remibergsma and @karuturi Went through the code, which was quite straight forward. Based on that, this PR LGTM 👍 Cheers, |
Contributor
|
Had a look yesterday and lgtm, didn't want to comment untill I saw the test results. (It seemed so small ;) |
asfgit
pushed a commit
that referenced
this pull request
Nov 17, 2015
Merge 4.6 release branch to masterInitial merge of 4.6 to master ignored pom.xml version number changes and changes to debian/changelog and engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java Following commands were executed ``` 1. git checkout 4.6 2. git pull --rebase 3. git checkout master 4. git pull --rebase 5. git fwd-merge 4.6 6. git diff --name-only | grep pom.xml | xargs git checkout --ours 7. git diff --name-only | grep pom.xml | xargs git add 8. git checkout --ours engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java 9. git add engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java 10. git checkout --ours debian/changelog 11. git add debian/changelog 12. # manually edited version number in tools/marvin/marvin/deployAndRun.py and tools/marvin/setup.py 13. git commit 14. git checkout -b "merge-46-to-master" ``` * pr/1071: Fixed version number in build/replace.properties more poms didn't get updated with script implemented upgrade path from 4.6.0 to 4.6.1 checkstyle pom didn't get updated with script debian: add 4.6.1-snapshot to changelog Updating pom.xml version numbers for release 4.6.1-SNAPSHOT Updating pom.xml version numbers for release 4.6.0 Signed-off-by: Remi Bergsma <github@remi.nl>
asfgit
pushed a commit
that referenced
this pull request
Dec 12, 2015
Updating pom.xml version numbers for release 4.6.2-SNAPSHOTSet next version in 4.6 release branch to version 4.6.2-SNAPSHOT. Using ` ./tools/build/setnextversion.sh`. Ping @bhaisaab @DaanHoogland before we merge this, how will we be creating the upgrade paths from 4.6.2 to 4.7? After this PR is merged, we need to manually do a fwd-merge and make sure we keep the pom versions in master/4.7. Much like in #1071. * pr/1186: Fixed typo in iam/pom.xml Updating pom.xml version numbers for release 4.6.2-SNAPSHOT Signed-off-by: Daan Hoogland <daan@onecht.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial merge of 4.6 to master
ignored pom.xml version number changes and changes to debian/changelog and engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
Following commands were executed