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/07/06 16:43:00 UTC
svn commit: r1358245 - in /accumulo/branches/1.4: ./ 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/ingest/bin/ s...
Author: ecn
Date: Fri Jul 6 14:42:59 2012
New Revision: 1358245
URL: http://svn.apache.org/viewvc?rev=1358245&view=rev
Log:
ACCUMULO-614 slide version in 1.4 branch now that 1.4.1 has been released
Modified:
accumulo/branches/1.4/README
accumulo/branches/1.4/bin/config.sh
accumulo/branches/1.4/docs/combiners.html
accumulo/branches/1.4/docs/config.html
accumulo/branches/1.4/pom.xml
accumulo/branches/1.4/src/core/pom.xml
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/branches/1.4/src/examples/pom.xml
accumulo/branches/1.4/src/examples/simple/pom.xml
accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh
accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml
accumulo/branches/1.4/src/examples/wikisearch/pom.xml
accumulo/branches/1.4/src/examples/wikisearch/query-war/pom.xml
accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml
accumulo/branches/1.4/src/server/pom.xml
accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile
accumulo/branches/1.4/src/server/src/main/c++/nativeMap/Makefile
accumulo/branches/1.4/src/server/src/main/resources/config.html
accumulo/branches/1.4/src/start/pom.xml
accumulo/branches/1.4/src/trace/pom.xml
Modified: accumulo/branches/1.4/README
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/README?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/README (original)
+++ accumulo/branches/1.4/README Fri Jul 6 14:42:59 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.1-SNAPSHOT-dist.tar.gz).
+tar xvzf accumulo-1.4.2-SNAPSHOT-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.1-SNAPSHOT has been tested with hadoop version 0.20.2.
+Accumulo 1.4.2-SNAPSHOT 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.1-SNAPSHOT
+ - version: 1.4.2-SNAPSHOT
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
@@ -180,7 +180,7 @@ certain column.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.1-SNAPSHOT
+ - version: 1.4.2-SNAPSHOT
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
Modified: accumulo/branches/1.4/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/bin/config.sh?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/bin/config.sh (original)
+++ accumulo/branches/1.4/bin/config.sh Fri Jul 6 14:42:59 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.1-SNAPSHOT
+ ACCUMULO_VERSION=1.4.2-SNAPSHOT
fi
if [ -z "$HADOOP_HOME" ]
Modified: accumulo/branches/1.4/docs/combiners.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/docs/combiners.html?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/docs/combiners.html (original)
+++ accumulo/branches/1.4/docs/combiners.html Fri Jul 6 14:42:59 2012
@@ -30,7 +30,7 @@
<p><pre>
Shell - Apache Accumulo Interactive Shell
-- version: 1.4.1-SNAPSHOT
+- version: 1.4.2-SNAPSHOT
- instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
-
- type 'help' for a list of available commands
Modified: accumulo/branches/1.4/docs/config.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/docs/config.html?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/docs/config.html (original)
+++ accumulo/branches/1.4/docs/config.html Fri Jul 6 14:42:59 2012
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.1-SNAPSHOT
+ - version: 1.4.2-SNAPSHOT
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: accumulo/branches/1.4/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/pom.xml (original)
+++ accumulo/branches/1.4/pom.xml Fri Jul 6 14:42:59 2012
@@ -27,7 +27,7 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<name>accumulo</name>
<modules>
@@ -662,22 +662,22 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</dependency>
<!-- additional dependencies we need to provide -->
Modified: accumulo/branches/1.4/src/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/pom.xml (original)
+++ accumulo/branches/1.4/src/core/pom.xml Fri Jul 6 14:42:59 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/Constants.java Fri Jul 6 14:42:59 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.1-SNAPSHOT";
+ public static final String VERSION = "1.4.2-SNAPSHOT";
public static final int DATA_VERSION = 4;
public static final int PREV_DATA_VERSION = 3;
Modified: accumulo/branches/1.4/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/pom.xml Fri Jul 6 14:42:59 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>accumulo-examples</artifactId>
Modified: accumulo/branches/1.4/src/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/simple/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/simple/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/simple/pom.xml Fri Jul 6 14:42:59 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh Fri Jul 6 14:42:59 2012
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://'
#
# Map/Reduce job
#
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.1-SNAPSHOT.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.2-SNAPSHOT.jar
CONF=$SCRIPT_DIR/../conf/wikipedia.xml
HDFS_DATA_DIR=$1
export HADOOP_CLASSPATH=$CLASSPATH
Modified: accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh Fri Jul 6 14:42:59 2012
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://'
#
# Map/Reduce job
#
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.1-SNAPSHOT.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.2-SNAPSHOT.jar
CONF=$SCRIPT_DIR/../conf/wikipedia.xml
HDFS_DATA_DIR=$1
export HADOOP_CLASSPATH=$CLASSPATH
Modified: accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml Fri Jul 6 14:42:59 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: accumulo/branches/1.4/src/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/pom.xml Fri Jul 6 14:42:59 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-examples</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>accumulo-wikisearch</artifactId>
Modified: accumulo/branches/1.4/src/examples/wikisearch/query-war/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/query-war/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/query-war/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/query-war/pom.xml Fri Jul 6 14:42:59 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>wikisearch-query-war</artifactId>
Modified: accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml Fri Jul 6 14:42:59 2012
@@ -19,7 +19,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: accumulo/branches/1.4/src/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/pom.xml (original)
+++ accumulo/branches/1.4/src/server/pom.xml Fri Jul 6 14:42:59 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile (original)
+++ accumulo/branches/1.4/src/server/src/main/c++/mlock/Makefile Fri Jul 6 14:42:59 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.1-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+ javah -classpath ../../../../../../lib/accumulo-server-1.4.2-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: accumulo/branches/1.4/src/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/src/main/c++/nativeMap/Makefile (original)
+++ accumulo/branches/1.4/src/server/src/main/c++/nativeMap/Makefile Fri Jul 6 14:42:59 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.1-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+ javah -classpath ../../../../../../lib/accumulo-server-1.4.2-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: accumulo/branches/1.4/src/server/src/main/resources/config.html
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/resources/config.html?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/src/main/resources/config.html (original)
+++ accumulo/branches/1.4/src/server/src/main/resources/config.html Fri Jul 6 14:42:59 2012
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.4.1-SNAPSHOT
+ - version: 1.4.2-SNAPSHOT
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: accumulo/branches/1.4/src/start/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/start/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/start/pom.xml (original)
+++ accumulo/branches/1.4/src/start/pom.xml Fri Jul 6 14:42:59 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: accumulo/branches/1.4/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/trace/pom.xml?rev=1358245&r1=1358244&r2=1358245&view=diff
==============================================================================
--- accumulo/branches/1.4/src/trace/pom.xml (original)
+++ accumulo/branches/1.4/src/trace/pom.xml Fri Jul 6 14:42:59 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>