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 2012/03/26 18:38:20 UTC
svn commit: r1305438 - in /accumulo/branches/1.3: ./ bin/ docs/
docs/examples/ src/core/ src/core/src/main/java/org/apache/accumulo/core/
src/examples/ src/server/ src/server/src/main/c++/mlock/
src/server/src/main/c++/nativeMap/ src/server/src/main/re...
Author: ecn
Date: Mon Mar 26 16:38:19 2012
New Revision: 1305438
URL: http://svn.apache.org/viewvc?rev=1305438&view=rev
Log:
ACCUMULO-481 catching up to the infrastruture changes
Removed:
accumulo/branches/1.3/DISCLAIMER
Modified:
accumulo/branches/1.3/README
accumulo/branches/1.3/bin/config.sh
accumulo/branches/1.3/docs/aggregation.html
accumulo/branches/1.3/docs/config.html
accumulo/branches/1.3/docs/examples/README.aggregation
accumulo/branches/1.3/docs/examples/README.bloom
accumulo/branches/1.3/docs/examples/README.constraints
accumulo/branches/1.3/docs/examples/README.mapred
accumulo/branches/1.3/docs/mockAccumulo.html
accumulo/branches/1.3/pom.xml
accumulo/branches/1.3/src/core/pom.xml
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/branches/1.3/src/examples/pom.xml
accumulo/branches/1.3/src/server/pom.xml
accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile
accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile
accumulo/branches/1.3/src/server/src/main/resources/config.html
accumulo/branches/1.3/src/start/pom.xml
accumulo/branches/1.3/src/trace/pom.xml
Modified: accumulo/branches/1.3/README
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/README?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/README (original)
+++ accumulo/branches/1.3/README Mon Mar 26 16:38:19 2012
@@ -24,7 +24,7 @@ Run "mvn package && mvn assembly:single"
Copy the accumulo tar file produced by "mvn package && mvn assembly:single" from
the target/ directory to the desired destination, then untar it (e.g.
-tar xvzf accumulo-1.3.6-incubating-SNAPSHOT-dist.tar.gz).
+tar xvzf accumulo-1.3.6-SNAPSHOT-dist.tar.gz).
If you are using the RPM, install the RPM on every machine that will run
accumulo.
@@ -41,7 +41,7 @@ found in the same location on every mach
have password-less ssh set up as described in the hadoop documentation.
You will need to have hadoop installed and configured on your system.
-Apache Accumulo 1.3.6-incubating-SNAPSHOT has been tested with hadoop version
+Apache Accumulo 1.3.6-SNAPSHOT has been tested with hadoop version
0.20.1 and 0.20.2.
Create a "slaves" file in $ACCUMULO_HOME/conf/. This is a list of machines
@@ -108,7 +108,7 @@ scanned.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.3.6-incubating-SNAPSHOT
+ - version: 1.3.6-SNAPSHOT
- instance name: acu13
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
@@ -129,7 +129,7 @@ certain column.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.3.6-incubating-SNAPSHOT
+ - version: 1.3.6-SNAPSHOT
- instance name: acu13
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
Modified: accumulo/branches/1.3/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/bin/config.sh?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/bin/config.sh (original)
+++ accumulo/branches/1.3/bin/config.sh Mon Mar 26 16:38:19 2012
@@ -47,7 +47,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
export ACCUMULO_LOG_DIR
if [ -z ${ACCUMULO_VERSION} ]; then
- ACCUMULO_VERSION=1.3.6-incubating-SNAPSHOT
+ ACCUMULO_VERSION=1.3.6-SNAPSHOT
fi
if [ -z "$HADOOP_HOME" ]
Modified: accumulo/branches/1.3/docs/aggregation.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/aggregation.html?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/aggregation.html (original)
+++ accumulo/branches/1.3/docs/aggregation.html Mon Mar 26 16:38:19 2012
@@ -29,7 +29,7 @@
<p><pre>
Shell - Apache Accumulo Interactive Shell
-- version: 1.3.6-incubating-SNAPSHOT
+- version: 1.3.6-SNAPSHOT
- instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
-
- type 'help' for a list of available commands
Modified: accumulo/branches/1.3/docs/config.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/config.html?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/config.html (original)
+++ accumulo/branches/1.3/docs/config.html Mon Mar 26 16:38:19 2012
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.3.6-incubating-SNAPSHOT
+ - version: 1.3.6-SNAPSHOT
- instance name: ac13
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: accumulo/branches/1.3/docs/examples/README.aggregation
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/examples/README.aggregation?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/examples/README.aggregation (original)
+++ accumulo/branches/1.3/docs/examples/README.aggregation Mon Mar 26 16:38:19 2012
@@ -25,7 +25,7 @@ tar distribution.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.3.x-incubating
+ - version: 1.3.x
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
Modified: accumulo/branches/1.3/docs/examples/README.bloom
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/examples/README.bloom?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/examples/README.bloom (original)
+++ accumulo/branches/1.3/docs/examples/README.bloom Mon Mar 26 16:38:19 2012
@@ -24,7 +24,7 @@ Below table named bloom_test is created
$ ./accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.3.x-incubating
+ - version: 1.3.x
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
Modified: accumulo/branches/1.3/docs/examples/README.constraints
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/examples/README.constraints?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/examples/README.constraints (original)
+++ accumulo/branches/1.3/docs/examples/README.constraints Mon Mar 26 16:38:19 2012
@@ -26,7 +26,7 @@ the end shows the inserts were not allow
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.3.x-incubating
+ - version: 1.3.x
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
Modified: accumulo/branches/1.3/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/examples/README.mapred?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/examples/README.mapred (original)
+++ accumulo/branches/1.3/docs/examples/README.mapred Mon Mar 26 16:38:19 2012
@@ -33,7 +33,7 @@ for the column family count.
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.3.x-incubating
+ - version: 1.3.x
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
Modified: accumulo/branches/1.3/docs/mockAccumulo.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/docs/mockAccumulo.html?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/docs/mockAccumulo.html (original)
+++ accumulo/branches/1.3/docs/mockAccumulo.html Mon Mar 26 16:38:19 2012
@@ -54,7 +54,7 @@ $ ./bin/accumulo shell --fake -u root -p
Shell - Apache Accumulo Interactive Shell
-
-- version: 1.3.6-incubating-SNAPSHOT
+- version: 1.3.6-SNAPSHOT
- instance name: mock-instance
- instance id: mock-instance-id
-
Modified: accumulo/branches/1.3/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/pom.xml?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/pom.xml (original)
+++ accumulo/branches/1.3/pom.xml Mon Mar 26 16:38:19 2012
@@ -28,37 +28,37 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
<name>accumulo</name>
- <url>http://incubator.apache.org/accumulo</url>
+ <url>http://accumulo.apache.org</url>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
<mailingLists>
<mailingList>
<name>User List</name>
- <subscribe>accumulo-user-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>accumulo-user-unsubscribe@incubator.apache.org</unsubscribe>
- <post>accumulo-user@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-accumulo-user/</archive>
+ <subscribe>accumulo-user-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>accumulo-user-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>accumulo-user@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-user/</archive>
</mailingList>
<mailingList>
<name>Developer List</name>
- <subscribe>accumulo-dev-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>accumulo-dev-unsubscribe@incubator.apache.org</unsubscribe>
- <post>accumulo-dev@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-accumulo-dev/</archive>
+ <subscribe>accumulo-dev-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>accumulo-dev-unsubscribe@accumulo.apache.org</unsubscribe>
+ <post>accumulo-dev@accumulo.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev/</archive>
</mailingList>
<mailingList>
<name>Commits List</name>
- <subscribe>accumulo-commits-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>accumulo-commits-unsubscribe@incubator.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-accumulo-commits/</archive>
+ <subscribe>accumulo-commits-subscribe@accumulo.apache.org</subscribe>
+ <unsubscribe>accumulo-commits-unsubscribe@accumulo.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits/</archive>
</mailingList>
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3</developerConnection>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/branches/1.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/branches/1.3</developerConnection>
<url>http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3</url>
</scm>
@@ -220,7 +220,7 @@
on Google's BigTable design.
</description>
<copyright>2011 The Apache Software Foundation.</copyright>
- <url>http://incubator.apache.org/accumulo</url>
+ <url>http://accumulo.apache.org</url>
<needarch>true</needarch>
<group>Utilities</group>
<requires>
@@ -519,22 +519,22 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
</dependency>
<!-- additional dependencies we need to provide -->
@@ -627,7 +627,7 @@
<repositories>
<repository>
<id>legacy-releases</id>
- <url>http://incubator.apache.org/accumulo/mvn_repo</url>
+ <url>http://accumulo.apache.org/mvn_repo</url>
</repository>
</repositories>
Modified: accumulo/branches/1.3/src/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/core/pom.xml?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/core/pom.xml (original)
+++ accumulo/branches/1.3/src/core/pom.xml Mon Mar 26 16:38:19 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java Mon Mar 26 16:38:19 2012
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
public class Constants {
- public static final String VERSION = "1.3.6-incubating-SNAPSHOT";
+ public static final String VERSION = "1.3.6-SNAPSHOT";
public static final int DATA_VERSION = 3;
// Zookeeper locations
Modified: accumulo/branches/1.3/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/examples/pom.xml?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/examples/pom.xml (original)
+++ accumulo/branches/1.3/src/examples/pom.xml Mon Mar 26 16:38:19 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.3/src/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/server/pom.xml?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/server/pom.xml (original)
+++ accumulo/branches/1.3/src/server/pom.xml Mon Mar 26 16:38:19 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile (original)
+++ accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile Mon Mar 26 16:38:19 2012
@@ -37,7 +37,7 @@ clean:
rm -f $(INSTALLED_LIBS) $(LIBS)
org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
- javah -classpath ../../../../../../lib/accumulo-server-1.3.6-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+ javah -classpath ../../../../../../lib/accumulo-server-1.3.6-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile (original)
+++ accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile Mon Mar 26 16:38:19 2012
@@ -36,7 +36,7 @@ clean:
rm -f $(INSTALLED_LIBS) $(LIBS)
org_apache_accumulo_server_tabletserver_NativeMap.h : ../../java/org/apache/accumulo/server/tabletserver/NativeMap.java
- javah -classpath ../../../../../../lib/accumulo-server-1.3.6-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+ javah -classpath ../../../../../../lib/accumulo-server-1.3.6-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: accumulo/branches/1.3/src/server/src/main/resources/config.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/server/src/main/resources/config.html?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/server/src/main/resources/config.html (original)
+++ accumulo/branches/1.3/src/server/src/main/resources/config.html Mon Mar 26 16:38:19 2012
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.3.6-incubating-SNAPSHOT
+ - version: 1.3.6-SNAPSHOT
- instance name: ac13
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: accumulo/branches/1.3/src/start/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/start/pom.xml?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/start/pom.xml (original)
+++ accumulo/branches/1.3/src/start/pom.xml Mon Mar 26 16:38:19 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.3/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/trace/pom.xml?rev=1305438&r1=1305437&r2=1305438&view=diff
==============================================================================
--- accumulo/branches/1.3/src/trace/pom.xml (original)
+++ accumulo/branches/1.3/src/trace/pom.xml Mon Mar 26 16:38:19 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.6-incubating-SNAPSHOT</version>
+ <version>1.3.6-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>