You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pu...@apache.org on 2015/11/09 11:07:52 UTC
[2/3] stratos git commit: Merge branch 'stratos-4.1.x' of
https://github.com/apache/stratos into pca-cep-fix
Merge branch 'stratos-4.1.x' of https://github.com/apache/stratos into pca-cep-fix
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cd3dd2d2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cd3dd2d2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cd3dd2d2
Branch: refs/heads/stratos-4.1.x
Commit: cd3dd2d26ab57680c9ba9aa6075f6a1c3d717926
Parents: eb5b259 2ff8527
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Mon Nov 9 13:10:51 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Mon Nov 9 13:10:51 2015 +0530
----------------------------------------------------------------------
.../console/app.js | 15 +-
.../console/applications_form.jag | 5 +-
.../console/controllers/login/login.jag | 20 +-
.../console/controllers/menu/menu.json | 14 +-
.../console/controllers/menu/menu_generator.jag | 33 +-
.../console/themes/theme0/css/custom.css | 11 +
.../themes/theme0/partials/metro_menu.hbs | 34 +-
.../ArtifactDistributionCoordinator.java | 79 ++--
.../metadata/client/beans/PropertyBean.java | 19 +-
.../src/main/python/README.rst | 75 ----
.../src/main/python/setup.py | 3 +-
.../rest/endpoint/api/StratosApiV41.java | 10 -
.../distribution/src/main/assembly/bin.xml | 23 +-
.../modules/distribution/src/main/notice/NOTICE | 4 +-
.../modules/distribution/src/main/readme/README | 25 --
.../src/main/conf/cartridge-config.properties | 1 +
.../integration/common/rest/RestClient.java | 122 +++--
.../application/MetadataServiceTestCase.java | 447 +++++++++++++++++++
.../SampleApplicationStartupTestCase.java | 15 +-
...pplication-policy-metadata-service-test.json | 17 +
.../application-metadata-service-test-1.json | 24 +
.../application-metadata-service-test-2.json | 24 +
...utoscaling-policy-metadata-service-test.json | 14 +
.../c1-application-metadata-service-test.json | 45 ++
...deployment-policy-metadata-service-test.json | 18 +
...network-partition-metadata-service-test.json | 15 +
26 files changed, 868 insertions(+), 244 deletions(-)
----------------------------------------------------------------------