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 98A68D200 for ; Wed, 27 Jun 2012 19:26:06 +0000 (UTC) Received: (qmail 25069 invoked by uid 500); 27 Jun 2012 19:26:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 25052 invoked by uid 500); 27 Jun 2012 19:26:06 -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 25045 invoked by uid 99); 27 Jun 2012 19:26:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jun 2012 19:26:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jun 2012 19:26:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A35EF2388980 for ; Wed, 27 Jun 2012 19:25:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1354681 - in /accumulo/trunk: ./ core/ server/ src/ Date: Wed, 27 Jun 2012 19:25:45 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120627192545.A35EF2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Wed Jun 27 19:25:44 2012 New Revision: 1354681 URL: http://svn.apache.org/viewvc?rev=1354681&view=rev Log: ACCUMULO-646 ACCUMULO-659 ACCUMULO-17 merge to trunk Modified: accumulo/trunk/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1354670-1354672 Merged /accumulo/branches/1.4:r1354669-1354672 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/core:r1354669-1354672 Merged /accumulo/branches/1.4/src/core:r1354670-1354672 Merged /accumulo/branches/1.4:r1354671 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/server:r1354669-1354672 Merged /accumulo/branches/1.4/src/server:r1354670-1354672 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1354669-1354672 Merged /accumulo/branches/1.4/src/src:r1354670-1354672 Merged /accumulo/branches/1.4:r1354671