Merge remote-tracking branch 'public/master' into branch-0.8
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e8b737c8 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e8b737c8 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e8b737c8 Branch: refs/heads/branch-0.8 Commit: e8b737c8cae27aae1bb8c4c01818f9cd882d5bf5 Parents: c7d4b5b 1b7dbd8 Author: Konstantin Boudnik <[email protected]> Authored: Mon Sep 8 18:18:51 2014 -0700 Committer: Konstantin Boudnik <[email protected]> Committed: Mon Sep 8 18:18:51 2014 -0700 ---------------------------------------------------------------------- .../src/common/phoenix/install_phoenix.sh | 7 +++++++ .../src/common/phoenix/phoenix.default | 20 ++++++++++++++++++++ bigtop-packages/src/deb/phoenix/phoenix.dirs | 1 + bigtop-packages/src/deb/phoenix/rules | 1 + .../src/rpm/phoenix/SPECS/phoenix.spec | 6 ++++++ 5 files changed, 35 insertions(+) ----------------------------------------------------------------------
