You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/11/03 20:13:26 UTC
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
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
+}