Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 8C88D18B73 for ; Sat, 21 Nov 2015 22:30:33 +0000 (UTC) Received: (qmail 72626 invoked by uid 500); 21 Nov 2015 22:30:33 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 72594 invoked by uid 500); 21 Nov 2015 22:30:33 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 72584 invoked by uid 99); 21 Nov 2015 22:30:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Nov 2015 22:30:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F3F0E0A42; Sat, 21 Nov 2015 22:30:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 21 Nov 2015 22:30:38 -0000 Message-Id: <12d426aef4844d978c99cd6ebfb03b91@git.apache.org> In-Reply-To: <323c40ebdd4748c1a062aaa47c8a75a4@git.apache.org> References: <323c40ebdd4748c1a062aaa47c8a75a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b6e68b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b6e68b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b6e68b6 Branch: refs/heads/master Commit: 2b6e68b6a6966c4dc80b422aa9e7a1766936b7da Parents: 0e1da5a 1853d08 Author: Josh Elser Authored: Sat Nov 21 17:29:57 2015 -0500 Committer: Josh Elser Committed: Sat Nov 21 17:29:57 2015 -0500 ---------------------------------------------------------------------- fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b6e68b6/fate/src/main/java/org/apache/accumulo/fate/Fate.java ----------------------------------------------------------------------