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 BF6621050D for ; Thu, 2 Jan 2014 17:47:06 +0000 (UTC) Received: (qmail 55453 invoked by uid 500); 2 Jan 2014 17:43:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 55122 invoked by uid 500); 2 Jan 2014 17:42:47 -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 54830 invoked by uid 99); 2 Jan 2014 17:42:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jan 2014 17:42:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B993691401A; Thu, 2 Jan 2014 17:42:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Thu, 02 Jan 2014 17:42:25 -0000 Message-Id: <5afd8a72b0b842e9b300c39023af47e5@git.apache.org> In-Reply-To: <489f02b3085144eaa0e035f587e30443@git.apache.org> References: <489f02b3085144eaa0e035f587e30443@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/12] 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/simple/examples.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b5e84bcd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b5e84bcd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b5e84bcd Branch: refs/heads/master Commit: b5e84bcd3108b446747e92a4915f7c7afe7f4a2c Parents: 114b58d d63cf6f Author: Christopher Tubbs Authored: Tue Dec 31 17:43:13 2013 -0500 Committer: Christopher Tubbs Committed: Tue Dec 31 17:43:13 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------