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 1692210327 for ; Wed, 15 Jan 2014 21:10:14 +0000 (UTC) Received: (qmail 51184 invoked by uid 500); 15 Jan 2014 21:10:07 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 51036 invoked by uid 500); 15 Jan 2014 21:10:02 -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 50888 invoked by uid 99); 15 Jan 2014 21:09:59 -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, 15 Jan 2014 21:09:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 497D583438D; Wed, 15 Jan 2014 21:09:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhavanki@apache.org To: commits@accumulo.apache.org Date: Wed, 15 Jan 2014 21:10:05 -0000 Message-Id: <5b4ba29106634357bfb9ba4f14bd259e@git.apache.org> In-Reply-To: <0ef1764718d548b0a9c25cee7317d5b0@git.apache.org> References: <0ef1764718d548b0a9c25cee7317d5b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours) Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d183132c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d183132c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d183132c Branch: refs/heads/1.6.0-SNAPSHOT Commit: d183132c40efdbc2fcacf92a64c43f87454792ee Parents: ea41264 5fdecd7 Author: Bill Havanki Authored: Wed Jan 15 16:09:03 2014 -0500 Committer: Bill Havanki Committed: Wed Jan 15 16:09:03 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------