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 DC1AD9AF7 for ; Wed, 21 Mar 2012 19:48:27 +0000 (UTC) Received: (qmail 49223 invoked by uid 500); 21 Mar 2012 19:48:27 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 49191 invoked by uid 500); 21 Mar 2012 19:48:27 -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 49184 invoked by uid 99); 21 Mar 2012 19:48:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2012 19:48:27 +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, 21 Mar 2012 19:48:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C11CB2388A32; Wed, 21 Mar 2012 19:48:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1303535 - /incubator/accumulo/trunk/ Date: Wed, 21 Mar 2012 19:48:06 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120321194806.C11CB2388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Wed Mar 21 19:48:06 2012 New Revision: 1303535 URL: http://svn.apache.org/viewvc?rev=1303535&view=rev Log: ACCUMULO-481: "merge" to trunk Modified: incubator/accumulo/trunk/ (props changed) Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ Merged /incubator/accumulo/branches/1.4:r1303527