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 C9ED810042 for ; Fri, 13 Dec 2013 01:51:56 +0000 (UTC) Received: (qmail 89066 invoked by uid 500); 13 Dec 2013 01:51:56 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 88893 invoked by uid 500); 13 Dec 2013 01:51:56 -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 88626 invoked by uid 99); 13 Dec 2013 01:51:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Dec 2013 01:51:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F08328B70B9; Fri, 13 Dec 2013 01:51:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Fri, 13 Dec 2013 01:52:04 -0000 Message-Id: <46c08d4dca234cc79fb727571b352af3@git.apache.org> In-Reply-To: <47d7f33961904c198e03994fa09e0520@git.apache.org> References: <47d7f33961904c198e03994fa09e0520@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3dc5630d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3dc5630d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3dc5630d Branch: refs/heads/master Commit: 3dc5630d813660d0d89eb66c48219359cf3d44b5 Parents: feacbfe 6248299 Author: Mike Drob Authored: Thu Dec 12 17:50:15 2013 -0800 Committer: Mike Drob Committed: Thu Dec 12 17:50:15 2013 -0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------