You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/30 20:57:10 UTC

[03/12] git commit: Merge branch 'develop' into feature/SLIDER-94-workflow-services-to-YARN

Merge branch 'develop' into feature/SLIDER-94-workflow-services-to-YARN


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9162ac7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9162ac7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9162ac7c

Branch: refs/heads/develop
Commit: 9162ac7ce516d3a22784eca9b808ddc2b74801fa
Parents: 8f4b864 a363abe
Author: Steve Loughran <st...@apache.org>
Authored: Thu May 29 11:10:15 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu May 29 11:10:15 2014 +0100

----------------------------------------------------------------------
 app-packages/accumulo-v1_5/README.txt           | 17 ++++++++
 app-packages/accumulo-v1_5/jmx_metrics.json     | 41 ++++++++++++++++++++
 app-packages/accumulo-v1_5/metainfo.xml         |  8 ++++
 app-packages/hbase-v0_96/README.txt             | 17 ++++++++
 app-packages/storm-v0_91/README.txt             | 17 ++++++++
 app-packages/storm-v0_91/appConfig.json         |  8 ++--
 app-packages/storm-v0_91/ganglia_metrics.json   | 31 +++++++++++++++
 app-packages/storm-v0_91/jmx_metrics.json       | 31 +++++++++++++++
 .../storm-v0_91/package/scripts/params.py       | 10 +++--
 .../package/templates/config.yaml.j2            |  3 +-
 pom.xml                                         |  4 +-
 slider-agent/pom.xml                            |  4 +-
 slider-assembly/pom.xml                         |  4 +-
 slider-core/pom.xml                             |  4 +-
 slider-funtest/pom.xml                          |  4 +-
 .../accumulo/accumulo-funtests/pom.xml          |  4 +-
 .../accumulo/slider-accumulo-provider/pom.xml   |  4 +-
 slider-providers/hbase/hbase-funtests/pom.xml   |  4 +-
 .../hbase/slider-hbase-provider/pom.xml         |  4 +-
 .../markdown/release_notes/release-0.24.0.md    | 33 ----------------
 .../markdown/release_notes/release-0.30.0.md    | 36 +++++++++++++++++
 21 files changed, 230 insertions(+), 58 deletions(-)
----------------------------------------------------------------------