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 A7B12106B1 for ; Mon, 28 Oct 2013 04:08:31 +0000 (UTC) Received: (qmail 11212 invoked by uid 500); 28 Oct 2013 04:08:31 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 11177 invoked by uid 500); 28 Oct 2013 04:08:31 -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 11166 invoked by uid 99); 28 Oct 2013 04:08:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 04:08:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58190882920; Mon, 28 Oct 2013 04:08:30 +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: Mon, 28 Oct 2013 04:08:31 -0000 Message-Id: <60d058c28d6c4c9d83415b4b695a31e7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/5] git commit: Merge branch '1.5.1-SNAPSHOT' Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bbaf3f93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bbaf3f93 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bbaf3f93 Branch: refs/heads/master Commit: bbaf3f93b283c18545116e929a82f95031a330af Parents: cdc1dc9 60609f3 Author: Josh Elser Authored: Mon Oct 28 00:00:20 2013 -0400 Committer: Josh Elser Committed: Mon Oct 28 00:00:20 2013 -0400 ---------------------------------------------------------------------- server/src/main/c++/nativeMap/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbaf3f93/server/src/main/c++/nativeMap/Makefile ----------------------------------------------------------------------