You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2015/11/10 08:16:19 UTC

[2/2] stratos git commit: Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x

Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x


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

Branch: refs/heads/stratos-4.1.x
Commit: f7263a885aecd35993e3e02332b499f4fca22d51
Parents: d2a3237 5407266
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Nov 10 12:45:27 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Nov 10 12:45:27 2015 +0530

----------------------------------------------------------------------
 .../cartridge.agent/healthstats.py              |   94 +-
 .../src/main/python/README.md                   |   40 +-
 .../src/main/python/cli/CLI.py                  | 1530 ----------------
 .../src/main/python/cli/Configs.py              |   32 -
 .../src/main/python/cli/Exceptions.py           |   25 -
 .../src/main/python/cli/Logging.py              |   29 -
 .../src/main/python/cli/Main.py                 |   66 -
 .../src/main/python/cli/Stratos.py              |  489 -----
 .../src/main/python/cli/Utils.py                |   99 -
 .../src/main/python/cli/cli.py                  | 1690 ++++++++++++++++++
 .../src/main/python/cli/config.py               |   32 +
 .../src/main/python/cli/exception.py            |   26 +
 .../src/main/python/cli/logutils.py             |   29 +
 .../src/main/python/cli/main.py                 |   71 +
 .../src/main/python/cli/restclient.py           |  493 +++++
 .../src/main/python/cli/utils.py                |   38 +
 .../src/main/python/setup.cfg                   |    2 -
 .../src/main/python/setup.py                    |   46 -
 .../GadgetLoadAverage/Load_Average/js/igviz.js  |    2 +-
 .../GadgetMemoryUsage/Memory_Usage/js/igviz.js  |    2 +-
 .../integration/tests/CEPHAModeTestCase.java    |  292 +++
 .../test/resources/CEPHAModeTestCase/agent.conf |   46 +
 .../resources/CEPHAModeTestCase/logging.ini     |   52 +
 .../CEPHAModeTestCase/payload/launch-params     |    1 +
 .../distribution/src/main/assembly/bin.xml      |   13 +-
 .../distribution/src/main/bin/stratos.sh        |   34 +
 26 files changed, 2878 insertions(+), 2395 deletions(-)
----------------------------------------------------------------------