Merge pull request #1665 from shapeblue/jsb/4.9.1.0-version Changes database upgrade script names to be consistent for the 4.9.1.0 release * Changes the names of the schema-490to491* scripts to schema-490to4910* * Changes the name of the Upgrade490to491 class to Upgrade490to4910 * Modifies the Marvin setup.py script to use version 4.9.1.0-SNAPSHOT
/cc @rhtyd @karuturi * pr/1665: Renames of 4.9.0->4.9.1.0 upgrade scripts to match the four position version scheme Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de73bdd5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de73bdd5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de73bdd5 Branch: refs/heads/4.9-bountycastle-daan Commit: de73bdd5a760df80af5933f8870102706aac1241 Parents: 1e00125 eabda0e Author: Rohit Yadav <[email protected]> Authored: Fri Sep 2 16:02:50 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Sep 2 16:11:16 2016 +0530 ---------------------------------------------------------------------- .../cloud/upgrade/DatabaseUpgradeChecker.java | 112 +++++++++---------- .../com/cloud/upgrade/dao/Upgrade490to491.java | 66 ----------- .../com/cloud/upgrade/dao/Upgrade490to4910.java | 64 +++++++++++ .../upgrade/DatabaseUpgradeCheckerTest.java | 4 +- setup/db/db/schema-490to491-cleanup.sql | 21 ---- setup/db/db/schema-490to491.sql | 33 ------ setup/db/db/schema-490to4910-cleanup.sql | 21 ++++ setup/db/db/schema-490to4910.sql | 33 ++++++ tools/marvin/setup.py | 2 +- 9 files changed, 177 insertions(+), 179 deletions(-) ----------------------------------------------------------------------
