Merge branch 'feature/update_storm_for_93' into develop

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

Branch: refs/heads/feature/slider_install_package
Commit: f66c0cbc0f211da1ea52acf7cad8a20480a1f5ea
Parents: 8da1503 4b2f8aa
Author: Jon Maron <[email protected]>
Authored: Mon Sep 8 09:41:14 2014 -0400
Committer: Jon Maron <[email protected]>
Committed: Mon Sep 8 09:41:14 2014 -0400

----------------------------------------------------------------------
 app-packages/storm/README.txt                    | 19 +++++++++++--------
 app-packages/storm/appConfig.json                |  4 ++--
 app-packages/storm/metainfo.xml                  |  2 +-
 app-packages/storm/package/scripts/params.py     |  6 +++---
 app-packages/storm/package/scripts/service.py    |  6 +++---
 app-packages/storm/package/scripts/storm.py      |  9 ++++++---
 .../storm/package/scripts/yaml_config.py         | 10 +++++++++-
 .../storm/package/templates/storm_jaas.conf.j2   | 11 ++++-------
 app-packages/storm/resources.json                |  4 ++--
 9 files changed, 41 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


Reply via email to