Merge remote-tracking branch 'origin/branch-1.7.0' into branch-1.7.0
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/766838b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/766838b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/766838b5 Branch: refs/heads/branch-1.7.0 Commit: 766838b5fc001281e2fb9dadb483963e71475baf Parents: 2e1cbd4 0cdc6d9 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Wed Nov 5 20:04:11 2014 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Wed Nov 5 20:04:11 2014 +0200 ---------------------------------------------------------------------- .../2.1/services/STORM/package/scripts/storm.py | 9 ++++- .../services/STORM/configuration/storm-env.xml | 40 ++++++++++++++++++++ .../python/stacks/2.1/STORM/test_storm_base.py | 2 + 3 files changed, 50 insertions(+), 1 deletion(-) ----------------------------------------------------------------------