You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2012/03/21 20:45:43 UTC
svn commit: r1303530 - in /incubator/accumulo/branches/1.4.0rc: ./ bin/
docs/ src/core/ src/core/src/main/java/org/apache/accumulo/core/
src/examples/ src/examples/simple/ src/examples/wikisearch/
src/examples/wikisearch/ingest/ src/examples/wikisearch...
Author: kturner
Date: Wed Mar 21 19:45:42 2012
New Revision: 1303530
URL: http://svn.apache.org/viewvc?rev=1303530&view=rev
Log:
ACCUMULO-145 changed version from 1.4.0-incubating to 1.4.0
Modified:
incubator/accumulo/branches/1.4.0rc/README
incubator/accumulo/branches/1.4.0rc/bin/config.sh
incubator/accumulo/branches/1.4.0rc/docs/combiners.html
incubator/accumulo/branches/1.4.0rc/docs/config.html
incubator/accumulo/branches/1.4.0rc/pom.xml
incubator/accumulo/branches/1.4.0rc/src/core/pom.xml
incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java
incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml
incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml
incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh
incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml
incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml
incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml
incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml
incubator/accumulo/branches/1.4.0rc/src/server/pom.xml
incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile
incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile
incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html
incubator/accumulo/branches/1.4.0rc/src/start/pom.xml
incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml
Modified: incubator/accumulo/branches/1.4.0rc/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/README?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/README (original)
+++ incubator/accumulo/branches/1.4.0rc/README Wed Mar 21 19:45:42 2012
@@ -37,7 +37,7 @@ easier to install.
Copy the accumulo tar file produced by "mvn package && mvn assembly:single -N"
from the target/ directory to the desired destination, then untar it (e.g.
-tar xvzf accumulo-1.4.0-incubating-dist.tar.gz).
+tar xvzf accumulo-1.4.0-dist.tar.gz).
If you are using the RPM/deb, install the RPM/deb on every machine that will run
accumulo.
@@ -64,7 +64,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.
-Accumulo 1.4.0-incubating has been tested with hadoop version 0.20.2.
+Accumulo 1.4.0 has been tested with hadoop version 0.20.2.
The example accumulo configuration files are placed in directories based on the
memory footprint for the accumulo processes. If you are using native libraries
@@ -159,7 +159,7 @@ scanned.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.0-incubating
+ - version: 1.4.0
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
@@ -180,7 +180,7 @@ certain column.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.0-incubating
+ - version: 1.4.0
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
Modified: incubator/accumulo/branches/1.4.0rc/bin/config.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/bin/config.sh?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/bin/config.sh (original)
+++ incubator/accumulo/branches/1.4.0rc/bin/config.sh Wed Mar 21 19:45:42 2012
@@ -46,7 +46,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
export ACCUMULO_LOG_DIR
if [ -z ${ACCUMULO_VERSION} ]; then
- ACCUMULO_VERSION=1.4.0-incubating
+ ACCUMULO_VERSION=1.4.0
fi
if [ -z "$HADOOP_HOME" ]
Modified: incubator/accumulo/branches/1.4.0rc/docs/combiners.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/docs/combiners.html?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/docs/combiners.html (original)
+++ incubator/accumulo/branches/1.4.0rc/docs/combiners.html Wed Mar 21 19:45:42 2012
@@ -30,7 +30,7 @@
<p><pre>
Shell - Apache Accumulo Interactive Shell
-- version: 1.4.0-incubating
+- version: 1.4.0
- instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
-
- type 'help' for a list of available commands
Modified: incubator/accumulo/branches/1.4.0rc/docs/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/docs/config.html?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/docs/config.html (original)
+++ incubator/accumulo/branches/1.4.0rc/docs/config.html Wed Mar 21 19:45:42 2012
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.0-incubating
+ - version: 1.4.0
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: incubator/accumulo/branches/1.4.0rc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/pom.xml Wed Mar 21 19:45:42 2012
@@ -27,7 +27,7 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<name>accumulo</name>
<modules>
@@ -670,22 +670,22 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
</dependency>
<!-- additional dependencies we need to provide -->
Modified: incubator/accumulo/branches/1.4.0rc/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/core/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/core/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/core/pom.xml Wed Mar 21 19:45:42 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java Wed Mar 21 19:45:42 2012
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
public class Constants {
- public static final String VERSION = "1.4.0-incubating";
+ public static final String VERSION = "1.4.0";
public static final int DATA_VERSION = 4;
public static final int PREV_DATA_VERSION = 3;
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml Wed Mar 21 19:45:42 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>accumulo-examples</artifactId>
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml Wed Mar 21 19:45:42 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh Wed Mar 21 19:45:42 2012
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://'
#
# Map/Reduce job
#
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0-incubating.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0.jar
CONF=$SCRIPT_DIR/../conf/wikipedia.xml
HDFS_DATA_DIR=$1
export HADOOP_CLASSPATH=$CLASSPATH
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh Wed Mar 21 19:45:42 2012
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://'
#
# Map/Reduce job
#
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0-incubating.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0.jar
CONF=$SCRIPT_DIR/../conf/wikipedia.xml
HDFS_DATA_DIR=$1
export HADOOP_CLASSPATH=$CLASSPATH
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml Wed Mar 21 19:45:42 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml Wed Mar 21 19:45:42 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-examples</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>accumulo-wikisearch</artifactId>
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml Wed Mar 21 19:45:42 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
</parent>
<artifactId>wikisearch-query-war</artifactId>
Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml Wed Mar 21 19:45:42 2012
@@ -19,7 +19,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.4.0rc/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/pom.xml Wed Mar 21 19:45:42 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile Wed Mar 21 19:45:42 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.4.0-incubating.jar org.apache.accumulo.server.tabletserver.$(LIB)
+ javah -classpath ../../../../../../lib/accumulo-server-1.4.0.jar org.apache.accumulo.server.tabletserver.$(LIB)
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile Wed Mar 21 19:45:42 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.4.0-incubating.jar org.apache.accumulo.server.tabletserver.NativeMap
+ javah -classpath ../../../../../../lib/accumulo-server-1.4.0.jar org.apache.accumulo.server.tabletserver.NativeMap
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html Wed Mar 21 19:45:42 2012
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.0-incubating
+ - version: 1.4.0
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: incubator/accumulo/branches/1.4.0rc/src/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/start/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/start/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/start/pom.xml Wed Mar 21 19:45:42 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml?rev=1303530&r1=1303529&r2=1303530&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml Wed Mar 21 19:45:42 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.0-incubating</version>
+ <version>1.4.0</version>
<relativePath>../../</relativePath>
</parent>