Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CCC511F15 for ; Tue, 9 Sep 2014 03:00:01 +0000 (UTC) Received: (qmail 38733 invoked by uid 500); 9 Sep 2014 03:00:01 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 38690 invoked by uid 500); 9 Sep 2014 03:00:01 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 38672 invoked by uid 99); 9 Sep 2014 03:00:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2014 03:00:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A8A0BA0F80F; Tue, 9 Sep 2014 03:00:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cos@apache.org To: commits@bigtop.apache.org Date: Tue, 09 Sep 2014 03:00:01 -0000 Message-Id: <814a92ca60324faf830ccdccd5debc3c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge remote-tracking branch 'public/master' into branch-0.8 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 Authored: Mon Sep 8 18:18:51 2014 -0700 Committer: Konstantin Boudnik 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(+) ----------------------------------------------------------------------