Return-Path: 
 <accumulo-commits-return-307-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
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 B4D0E711F
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Thu,  3 Nov 2011 19:13:50 +0000 (UTC)
Received: (qmail 94788 invoked by uid 500); 3 Nov 2011 19:13:50 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 94758 invoked by uid 500); 3 Nov 2011 19:13:50 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 94751 invoked by uid 99); 3 Nov 2011 19:13:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 19:13:50 +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; Thu, 03 Nov 2011 19:13:47 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BAE4E2388900;
	Thu,  3 Nov 2011 19:13:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1197275 - in /incubator/accumulo/trunk: ./
 src/assemble/dist.xml
 src/core/src/main/java/org/apache/accumulo/core/Constants.java
 src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
Date: Thu, 03 Nov 2011 19:13:26 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111103191326.BAE4E2388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecn
Date: Thu Nov  3 19:13:26 2011
New Revision: 1197275

URL: http://svn.apache.org/viewvc?rev=1197275&view=rev
Log:
ACCUMULO-86: merge updates to trunk

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/assemble/dist.xml
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  3 19:13:26 2011
@@ -1 +1 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066

Modified: incubator/accumulo/trunk/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/dist.xml?rev=1197275&r1=1197274&r2=1197275&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/dist.xml (original)
+++ incubator/accumulo/trunk/src/assemble/dist.xml Thu Nov  3 19:13:26 2011
@@ -25,6 +25,15 @@
     <fileSet>
       <directory>bin</directory>
       <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>logs</directory>
+      <directoryMode>0700</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>walogs</directory>
+      <directoryMode>0700</directoryMode>
     </fileSet>
     <fileSet>
       <includes>
@@ -62,8 +71,8 @@
         <exclude>**/test-*</exclude>
         <exclude>**/slaves</exclude>
         <exclude>**/masters</exclude>
-        <exclude>**/tracers</exclude>
         <exclude>**/monitor</exclude>
+        <exclude>**/tracers</exclude>
         <exclude>**/gc</exclude>
         <exclude>**/walkers.txt</exclude>
         <exclude>**/ingesters.txt</exclude>
@@ -73,6 +82,8 @@
         <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
         <exclude>**/randomwalk/conf/walkers</exclude>
       </excludes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
     </fileSet>
   </fileSets>
 </assembly>

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1197275&r1=1197274&r2=1197275&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java Thu Nov  3 19:13:26 2011
@@ -150,7 +150,7 @@ public class Constants {
   public static final int MAX_DATA_TO_PRINT = 64;
   public static final int CLIENT_RETRIES = 5;
   public static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2;
-  public static final String CORE_PACKAGE_NAME = "accumulo.core";
+  public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
   public static final String OLD_PACKAGE_NAME = "cloudbase";
   public static final String VALID_TABLE_NAME_REGEX = "^\\w+$";
   

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java?rev=1197275&r1=1197274&r2=1197275&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java Thu Nov  3 19:13:26 2011
@@ -30,7 +30,7 @@ public class HiddenCommand extends Comma
   
   @Override
   public String description() {
-    return "The first rule of Accumulus is: \"You don't talk about Accumulus.\"";
+    return "The first rule of Accumulo is: \"You don't talk about Accumulo.\"";
   }
   
   @Override
@@ -55,4 +55,4 @@ public class HiddenCommand extends Comma
   public String getName() {
     return "\0\0\0\0";
   }
-}
\ No newline at end of file
+}