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 75E5F18BAE for ; Mon, 18 Apr 2016 23:45:57 +0000 (UTC) Received: (qmail 5198 invoked by uid 500); 18 Apr 2016 23:45:57 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 5125 invoked by uid 500); 18 Apr 2016 23:45:57 -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 5015 invoked by uid 99); 18 Apr 2016 23:45:57 -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; Mon, 18 Apr 2016 23:45:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3923E03CE; Mon, 18 Apr 2016 23:45:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Mon, 18 Apr 2016 23:46:00 -0000 Message-Id: In-Reply-To: <696be9557bd14a9a97a78dad0217c85a@git.apache.org> References: <696be9557bd14a9a97a78dad0217c85a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9024dd91 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9024dd91 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9024dd91 Branch: refs/heads/master Commit: 9024dd91f54686c265da263edfe2fb0d46ba46c7 Parents: 7918299 0fee43f Author: Christopher Tubbs Authored: Mon Apr 18 19:45:08 2016 -0400 Committer: Christopher Tubbs Committed: Mon Apr 18 19:45:08 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9024dd91/.travis.yml ----------------------------------------------------------------------