Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B234574F5 for ; Mon, 21 Nov 2011 19:56:57 +0000 (UTC) Received: (qmail 38597 invoked by uid 500); 21 Nov 2011 19:56:57 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 38569 invoked by uid 500); 21 Nov 2011 19:56:57 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 38562 invoked by uid 99); 21 Nov 2011 19:56:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2011 19:56:57 +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; Mon, 21 Nov 2011 19:56:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8461C23889B3; Mon, 21 Nov 2011 19:56:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1204672 - /incubator/accumulo/trunk/ Date: Mon, 21 Nov 2011 19:56:36 -0000 To: accumulo-commits@incubator.apache.org From: afuchs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111121195636.8461C23889B3@eris.apache.org> Author: afuchs Date: Mon Nov 21 19:56:36 2011 New Revision: 1204672 URL: http://svn.apache.org/viewvc?rev=1204672&view=rev Log: ACCUMULO-166 merge from 1.4 branch Modified: incubator/accumulo/trunk/ (props changed) Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 21 19:56:36 2011 @@ -1,2 +1,2 @@ -/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683 -/incubator/accumulo/branches/1.4:1201902-1204634 +/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625 +/incubator/accumulo/branches/1.4:1201902-1204669