Merge pull request #1067 from remibergsma/460_461_upgrade_path 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 <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/f6db0a2a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f6db0a2a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f6db0a2a Branch: refs/heads/master Commit: f6db0a2a4948753c9ff584c20b5ae45ada6486f4 Parents: 33fb5ef e0ac9df Author: Remi Bergsma <git...@remi.nl> Authored: Sun Nov 15 21:09:35 2015 +0100 Committer: Remi Bergsma <git...@remi.nl> Committed: Sun Nov 15 21:09:35 2015 +0100 ---------------------------------------------------------------------- .../cloud/upgrade/DatabaseUpgradeChecker.java | 93 ++++++++++---------- .../com/cloud/upgrade/dao/Upgrade460to461.java | 67 ++++++++++++++ setup/db/db/schema-460to461-cleanup.sql | 20 +++++ setup/db/db/schema-460to461.sql | 20 +++++ 4 files changed, 155 insertions(+), 45 deletions(-) ----------------------------------------------------------------------