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 DB7DA10C39 for ; Thu, 20 Mar 2014 15:25:49 +0000 (UTC) Received: (qmail 64004 invoked by uid 500); 20 Mar 2014 15:25:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63955 invoked by uid 500); 20 Mar 2014 15:25: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 61280 invoked by uid 99); 20 Mar 2014 15:25:19 -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, 20 Mar 2014 15:25:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DF7B79861CD; Thu, 20 Mar 2014 15:25:18 +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: Thu, 20 Mar 2014 15:25:20 -0000 Message-Id: In-Reply-To: <6929a2d892494d1ca55f54f78759a16a@git.apache.org> References: <6929a2d892494d1ca55f54f78759a16a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/20] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f98331c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f98331c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f98331c Branch: refs/heads/ACCUMULO-2061 Commit: 8f98331c5ea3e3a3c0068b03bfdd37fb08dc4631 Parents: 7c2a552 082adbf Author: Eric Newton Authored: Fri Mar 14 14:18:56 2014 -0400 Committer: Eric Newton Committed: Fri Mar 14 14:18:56 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------