[cloudstack] 02/03: Merge #1951 from shapeblue:4930-upgradepath to apache:4.9

[bh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit b65a58ba12259adf7ed3dc1870842d00af6ced9d
Merge: 3c3cdbe 1cabd32
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri May 19 16:54:43 2017 +0530

    Merge #1951 from shapeblue:4930-upgradepath to apache:4.9
    
    CLOUDSTACK-9792: Add upgrade path for 4.9.3.0
    
    This adds an upgrade path from 4.9.2.0 to 4.9.3.0, this also includes
    changes from PR #1928 that adds missing hypervisor capability in
    4.9/4.10+. This also fixes a db-cleanup path sequence issues, with that
    puts 4.10 after 4.1.0, and before 4.2.0.
    
    Once validated I can help merge this on master, since this will cause
    merge conflicts on fwd-merging.
    
    Ping - @syed @karuturi @borisstoyanov @DaanHoogland @abhinandanprateek
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  | 119 ++++++++++----------
 .../com/cloud/upgrade/dao/Upgrade4920to4930.java   |  64 +++++++++++
 setup/db/db/schema-4920to4930-cleanup.sql          |  20 ++++
 setup/db/db/schema-4920to4930.sql                  | 123 +++++++++++++++++++++
 4 files changed, 269 insertions(+), 57 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.