Merge pull request #1071 from karuturi/merge-46-to-master 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 <git...@remi.nl> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf0c4f2e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf0c4f2e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf0c4f2e Branch: refs/heads/master Commit: bf0c4f2ecb425201e7cad4762c27d654f7cb9996 Parents: ea7c2d9 9ed8151 Author: Remi Bergsma <git...@remi.nl> Authored: Tue Nov 17 09:25:45 2015 +0100 Committer: Remi Bergsma <git...@remi.nl> Committed: Tue Nov 17 09:25:45 2015 +0100 ---------------------------------------------------------------------- build/replace.properties | 2 +- .../com/cloud/upgrade/dao/Upgrade460to461.java | 67 ++++++++++++++++++++ setup/db/db/schema-460to461-cleanup.sql | 20 ++++++ setup/db/db/schema-460to461.sql | 20 ++++++ tools/marvin/marvin/deployAndRun.py | 2 +- tools/marvin/setup.py | 2 +- 6 files changed, 110 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
