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 74E6D10814 for ; Wed, 13 Nov 2013 18:42:06 +0000 (UTC) Received: (qmail 81986 invoked by uid 500); 13 Nov 2013 18:42:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 81924 invoked by uid 500); 13 Nov 2013 18:42:06 -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 81835 invoked by uid 99); 13 Nov 2013 18:42:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Nov 2013 18:42:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E1DF28A8359; Wed, 13 Nov 2013 18:42:05 +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: Wed, 13 Nov 2013 18:42:07 -0000 Message-Id: <6caeaceba6a943b6a669ea9cfe5d59ea@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/TestUtils.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/050e7e25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/050e7e25 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/050e7e25 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 050e7e25db3fd762f65817768a64df4934ec80a7 Parents: 743d64b 7551b55 Author: Josh Elser Authored: Wed Nov 13 10:41:48 2013 -0800 Committer: Josh Elser Committed: Wed Nov 13 10:41:48 2013 -0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------