Merge branch 'develop' into feature/slider_install_package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9af04d6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9af04d6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9af04d6d Branch: refs/heads/feature/slider_install_package Commit: 9af04d6d480080c6b917f2c55bc5569fab2ffab0 Parents: b4c88a4 bff5ed6 Author: Sumit Mohanty <[email protected]> Authored: Mon Sep 8 14:37:01 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Sep 8 14:37:01 2014 -0700 ---------------------------------------------------------------------- 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 | 2 +- pom.xml | 11 ++--------- 10 files changed, 42 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
