cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject git commit: updated refs/heads/merge-45-to-master to f3cd0f7
Date Fri, 22 May 2015 05:07:41 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/merge-45-to-master [created] f3cd0f775


Merge branch '4.5'


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3cd0f77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3cd0f77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3cd0f77

Branch: refs/heads/merge-45-to-master
Commit: f3cd0f77522a00b359aaf917a4a2b24f59224176
Parents: 1cd2e9b c21aa89
Author: Rajani Karuturi <rajanikaruturi@gmail.com>
Authored: Fri May 22 10:34:32 2015 +0530
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
Committed: Fri May 22 10:34:32 2015 +0530

----------------------------------------------------------------------
 .../classes/resources/messages_hu.properties    | 961 ++++++++++---------
 .../classes/resources/messages_nb_NO.properties |   2 +-
 .../orchestration/NetworkOrchestrator.java      |   1 +
 .../cloud/upgrade/DatabaseUpgradeChecker.java   | 110 ++-
 .../com/cloud/upgrade/dao/Upgrade451to452.java  |  56 ++
 tools/marvin/marvin/deployAndRun.py             |   2 +-
 tools/transifex/.tx/config                      |   1 +
 ui/index.jsp                                    |   2 +-
 8 files changed, 617 insertions(+), 518 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3cd0f77/client/WEB-INF/classes/resources/messages_nb_NO.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3cd0f77/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --cc engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 6277df1,093f113..1107447
mode 100644,100755..100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@@ -47,8 -46,8 +47,9 @@@ import org.apache.cloudstack.engine.clo
  import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
  import org.apache.cloudstack.framework.config.ConfigDepot;
  import org.apache.cloudstack.framework.config.ConfigKey;
+ import org.apache.cloudstack.framework.config.ConfigKey.Scope;
  import org.apache.cloudstack.framework.config.Configurable;
 +import org.apache.cloudstack.framework.config.ConfigKey.Scope;
  import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
  import org.apache.cloudstack.framework.messagebus.MessageBus;
  import org.apache.cloudstack.framework.messagebus.PublishScope;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3cd0f77/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
----------------------------------------------------------------------
diff --cc engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index ff8fce6,2ad1481..5a8f37d
mode 100644,100755..100644
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@@ -73,7 -73,7 +73,8 @@@ import com.cloud.upgrade.dao.Upgrade441
  import com.cloud.upgrade.dao.Upgrade442to450;
  import com.cloud.upgrade.dao.Upgrade443to450;
  import com.cloud.upgrade.dao.Upgrade450to451;
+ import com.cloud.upgrade.dao.Upgrade451to452;
 +import com.cloud.upgrade.dao.Upgrade451to460;
  import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
  import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
  import com.cloud.upgrade.dao.VersionDao;
@@@ -104,7 -104,7 +105,7 @@@ public class DatabaseUpgradeChecker imp
              new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(),
              new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
new Upgrade410to420(),
              new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(),
-             new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade451to460()});
  
          _upgradeMap.put("2.1.8", new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(),
new UpgradeSnapshot217to224(),
              new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(),
new Upgrade225to226(),
@@@ -112,7 -112,8 +113,8 @@@
              new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(),
              new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
new Upgrade40to41(),
              new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(),
++            new Upgrade451to452(),  new Upgrade451to460()});
  
          _upgradeMap.put("2.1.9", new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(),
new UpgradeSnapshot217to224(),
              new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(),
new Upgrade225to226(),
@@@ -120,145 -121,175 +122,169 @@@
              new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(),
              new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
new Upgrade410to420(),
              new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(),
-             new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade451to460()});
  
          _upgradeMap.put("2.2.1", new DbUpgrade[] {new Upgrade221to222(), new UpgradeSnapshot223to224(),
new Upgrade222to224(),
              new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(),
              new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(),
              new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(),
new Upgrade302to40(),
              new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(),
-             new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460()});
 -            new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452()});
++            new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452(), new Upgrade451to460()});
  
          _upgradeMap.put("2.2.2", new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(),
new Upgrade224to225(),
              new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(),
              new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(),
 -            new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
 -            new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
 -            new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
 +            new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.3", new DbUpgrade[] {new Upgrade222to224(), new UpgradeSnapshot223to224(),
new Upgrade224to225(),
              new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(),
              new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(),
 -            new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
 -            new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
 -            new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
 +            new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.4", new DbUpgrade[] {new Upgrade224to225(), new Upgrade225to226(),
new Upgrade227to228(),
              new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212(),
              new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(),
              new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
 -            new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.5", new DbUpgrade[] {new Upgrade225to226(), new Upgrade227to228(),
new Upgrade228to229(),
              new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(),
              new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(),
              new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(),
-             new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.6", new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(),
new Upgrade229to2210(),
              new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(),
              new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(),
new Upgrade40to41(),
              new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
 -            new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.7", new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(),
new Upgrade229to2210(),
              new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(),
              new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(),
new Upgrade302to40(), new Upgrade40to41(),
              new Upgrade410to420(),
              new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(),
-             new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452()});
  
          _upgradeMap.put("2.2.8", new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(),
new Upgrade2210to2211(),
              new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30()
              , new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
 -            new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.9", new DbUpgrade[] {new Upgrade229to2210(), new Upgrade2210to2211(),
new Upgrade2211to2212(),
              new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(),
              new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.10", new DbUpgrade[] {new Upgrade2210to2211(), new Upgrade2211to2212(),
new Upgrade2212to2213(),
              new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(),
new Upgrade302to40(),
              new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(),
-             new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460()});
 -            new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452()});
++            new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
          _upgradeMap.put("2.2.12", new DbUpgrade[] {new Upgrade2212to2213(), new Upgrade2213to2214(),
new Upgrade2214to30(),
 -            new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
 -            new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(),
 -            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
 +            new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(),
new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(),
-             new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460()});
++            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.13", new DbUpgrade[] {new Upgrade2213to2214(), new Upgrade2214to30(),
new Upgrade30to301(),
              new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("2.2.14", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(),
new Upgrade301to302(),
              new Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(),
-             new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
 -            new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("3.0.0", new DbUpgrade[] {new Upgrade30to301(), new Upgrade301to302(),
new Upgrade302to40(),
              new Upgrade40to41(), new Upgrade410to420(),
-             new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
 -            new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("3.0.1", new DbUpgrade[] {new Upgrade301to302(), new Upgrade302to40(),
new Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(),
 -            new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("3.0.2", new DbUpgrade[] {new Upgrade302to40(), new Upgrade40to41(),
new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(),
-             new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.0.0", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.0.0", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(),
 -                new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.0.0", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), 
++        new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(),
++        new Upgrade451to452()});
  
-         _upgradeMap.put("4.0.1", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.0.1", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(),
 -                new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.0.1", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), 
++        new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.0.2", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.0.2", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(),
 -                new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.0.2", new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), 
++        new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.1.0", new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.1.0", new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(),
 -                new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.1.0", new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), 
++        new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.1.1", new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.1.1", new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(),
 -                new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.1.1", new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), 
++        new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.2.0", new DbUpgrade[] {new Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.2.0", new DbUpgrade[] {new Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(),
 -                new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452()});
++        _upgradeMap.put("4.2.0", new DbUpgrade[] {new Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), 
++        new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
new Upgrade451to452()});
  
-         _upgradeMap.put("4.2.1", new DbUpgrade[] {new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460()});
 -        _upgradeMap.put("4.2.1", new DbUpgrade[] {new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(),
 -                new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.2.1", new DbUpgrade[] {new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), 
++        new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.3.0", new DbUpgrade[] {new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.3.0", new DbUpgrade[] {new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(),
 -                new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.3.0", new DbUpgrade[] {new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
new Upgrade451to452()});
  
-         _upgradeMap.put("4.3.1", new DbUpgrade[] {new Upgrade431to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.3.1", new DbUpgrade[] {new Upgrade431to440(), new Upgrade440to441(),
new Upgrade441to442(),
 -                new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.3.1", new DbUpgrade[] {new Upgrade431to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
new Upgrade451to452()});
  
-         _upgradeMap.put("4.3.2", new DbUpgrade[] {new Upgrade432to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.3.2", new DbUpgrade[] {new Upgrade432to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(),
 -                new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.3.2", new DbUpgrade[] {new Upgrade432to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
new Upgrade451to452()});
  
-         _upgradeMap.put("4.4.0", new DbUpgrade[] {new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.4.0", new DbUpgrade[] {new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(),
 -                new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.4.0", new DbUpgrade[] {new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.4.1", new DbUpgrade[] {new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460() });
 -        _upgradeMap.put("4.4.1", new DbUpgrade[] {new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452() });
++        _upgradeMap.put("4.4.1", new DbUpgrade[] {new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452() });
  
-         _upgradeMap.put("4.4.2", new DbUpgrade[] {new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460()});
 -        _upgradeMap.put("4.4.2", new DbUpgrade[] {new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452()});
++        _upgradeMap.put("4.4.2", new DbUpgrade[] {new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.4.3", new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(),
new Upgrade451to460()});
 -        _upgradeMap.put("4.4.3", new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(),
new Upgrade451to452()});
++        _upgradeMap.put("4.4.3", new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("4.5.0", new DbUpgrade[] {new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("4.5.0", new DbUpgrade[] {new Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("4.5.0", new DbUpgrade[] {new Upgrade450to451(), new Upgrade451to460(),
new Upgrade451to452()});
  
-         _upgradeMap.put("4.5.1", new DbUpgrade[] {new Upgrade451to460()});
 -        _upgradeMap.put("4.5.1", new DbUpgrade[] {new Upgrade451to452()});
++        _upgradeMap.put("4.5.1", new DbUpgrade[] {new Upgrade451to460(), new Upgrade451to452()});
  
          //CP Upgrades
          _upgradeMap.put("3.0.3", new DbUpgrade[] {new Upgrade303to304(), new Upgrade304to305(),
new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(),
-             new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460()});
 -            new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
          _upgradeMap.put("3.0.4", new DbUpgrade[] {new Upgrade304to305(), new Upgrade305to306(),
new Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(),
-             new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
new Upgrade451to452()});
  
          _upgradeMap.put("3.0.5", new DbUpgrade[] {new Upgrade305to306(), new Upgrade306to307(),
new Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(),
-             new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
 -            new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460(),
++            new Upgrade451to452()});
  
          _upgradeMap.put("3.0.6", new DbUpgrade[] {new Upgrade306to307(), new Upgrade307to410(),
new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(),
-             new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460()});
 -            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452()});
++            new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452()});
  
-         _upgradeMap.put("3.0.7", new DbUpgrade[] {new Upgrade307to410(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
 -        _upgradeMap.put("3.0.7", new DbUpgrade[] {new Upgrade307to410(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(),
 -                new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452()});
++        _upgradeMap.put("3.0.7", new DbUpgrade[] {new Upgrade307to410(), new Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), 
++        new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to460(), new Upgrade451to452()});
  
          _upgradeMap.put("2.2.15", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(),
new Upgrade301to302(),
              new Upgrade302to303(), new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(),
new Upgrade306to307(), new Upgrade307to410(),
 -            new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
 -            new Upgrade450to451(), new Upgrade451to452()});
 +            new Upgrade410to420(),
-             new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
++            new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), 
++            new Upgrade450to451(), new Upgrade451to460(), new Upgrade451to452()});
  
          _upgradeMap.put("2.2.16", new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(),
new Upgrade301to302(),
              new Upgrade302to303(), new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(),
new Upgrade306to307(), new Upgrade307to410(),
 -            new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(),
 -            new Upgrade450to451(), new Upgrade451to452()});
 +            new Upgrade410to420(),
-             new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to460()});
++            new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), 
++            new Upgrade451to460(), new Upgrade451to452()});
      }
  
      protected void runScript(Connection conn, File file) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3cd0f77/tools/transifex/.tx/config
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3cd0f77/ui/index.jsp
----------------------------------------------------------------------


Mime
View raw message