ACCUMULO-1546 manually removing snapshot version references
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b783d14 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b783d14 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b783d14 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 7b783d14daf20da276694510fc2cc48cfc81dcd6 Parents: 3d9ac12 Author: Mike Drob <md...@mdrob.com> Authored: Sun Aug 11 12:42:50 2013 -0400 Committer: Mike Drob <md...@mdrob.com> Committed: Thu Aug 15 01:37:43 2013 -0400 ---------------------------------------------------------------------- README | 8 ++++---- bin/config.sh | 2 +- docs/combiners.html | 2 +- docs/config.html | 2 +- .../src/main/java/org/apache/accumulo/core/Constants.java | 2 +- src/examples/wikisearch/ingest/bin/ingest.sh | 2 +- src/examples/wikisearch/ingest/bin/ingest_parallel.sh | 2 +- src/server/src/main/c++/mlock/Makefile | 2 +- src/server/src/main/c++/nativeMap/Makefile | 2 +- src/server/src/main/resources/config.html | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/README ---------------------------------------------------------------------- diff --git a/README b/README index 8cfbd53..87c1421 100644 --- a/README +++ b/README @@ -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.4-SNAPSHOT-dist.tar.gz). +tar xvzf accumulo-1.4.4-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 machine in the cluster. You will need to 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.4-SNAPSHOT has been tested with hadoop version 0.20.2. +Accumulo 1.4.4 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.4-SNAPSHOT + - version: 1.4.4 - instance name: accumulo - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f - @@ -180,7 +180,7 @@ certain column. Shell - Apache Accumulo Interactive Shell - - - version: 1.4.4-SNAPSHOT + - version: 1.4.4 - instance name: accumulo - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f - http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/bin/config.sh ---------------------------------------------------------------------- diff --git a/bin/config.sh b/bin/config.sh index a89115a..485e259 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -69,7 +69,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null export ACCUMULO_LOG_DIR if [ -z ${ACCUMULO_VERSION} ]; then - ACCUMULO_VERSION=1.4.4-SNAPSHOT + ACCUMULO_VERSION=1.4.4 fi if [ -z "$HADOOP_HOME" ] http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/docs/combiners.html ---------------------------------------------------------------------- diff --git a/docs/combiners.html b/docs/combiners.html index 98b91d3..f4571e2 100644 --- a/docs/combiners.html +++ b/docs/combiners.html @@ -30,7 +30,7 @@ <p><pre> Shell - Apache Accumulo Interactive Shell -- version: 1.4.4-SNAPSHOT +- version: 1.4.4 - instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49 - - type 'help' for a list of available commands http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/docs/config.html ---------------------------------------------------------------------- diff --git a/docs/config.html b/docs/config.html index 97c2c6b..c8de95a 100644 --- a/docs/config.html +++ b/docs/config.html @@ -55,7 +55,7 @@ Shell - Apache Accumulo Interactive Shell - - - version: 1.4.4-SNAPSHOT + - version: 1.4.4 - instance name: ac14 - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181 - http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/src/core/src/main/java/org/apache/accumulo/core/Constants.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/Constants.java b/src/core/src/main/java/org/apache/accumulo/core/Constants.java index 05416eb..e5bc5b6 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/Constants.java +++ b/src/core/src/main/java/org/apache/accumulo/core/Constants.java @@ -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.4-SNAPSHOT"; + public static final String VERSION = "1.4.4"; public static final int DATA_VERSION = 4; public static final int PREV_DATA_VERSION = 3; http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/src/examples/wikisearch/ingest/bin/ingest.sh ---------------------------------------------------------------------- diff --git a/src/examples/wikisearch/ingest/bin/ingest.sh b/src/examples/wikisearch/ingest/bin/ingest.sh index 3eb5df4..aff15d3 100755 --- a/src/examples/wikisearch/ingest/bin/ingest.sh +++ b/src/examples/wikisearch/ingest/bin/ingest.sh @@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://' | sed 's/:/,/g'` # # Map/Reduce job # -JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4-SNAPSHOT.jar +JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4.jar CONF=$SCRIPT_DIR/../conf/wikipedia.xml HDFS_DATA_DIR=$1 export HADOOP_CLASSPATH=$CLASSPATH http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/src/examples/wikisearch/ingest/bin/ingest_parallel.sh ---------------------------------------------------------------------- diff --git a/src/examples/wikisearch/ingest/bin/ingest_parallel.sh b/src/examples/wikisearch/ingest/bin/ingest_parallel.sh index c2ef4b3..2f77520 100755 --- a/src/examples/wikisearch/ingest/bin/ingest_parallel.sh +++ b/src/examples/wikisearch/ingest/bin/ingest_parallel.sh @@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://' | sed 's/:/,/g'` # # Map/Reduce job # -JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4-SNAPSHOT.jar +JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.4.jar CONF=$SCRIPT_DIR/../conf/wikipedia.xml HDFS_DATA_DIR=$1 export HADOOP_CLASSPATH=$CLASSPATH http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/src/server/src/main/c++/mlock/Makefile ---------------------------------------------------------------------- diff --git a/src/server/src/main/c++/mlock/Makefile b/src/server/src/main/c++/mlock/Makefile index 0cc99a8..d1c8dab 100644 --- a/src/server/src/main/c++/mlock/Makefile +++ b/src/server/src/main/c++/mlock/Makefile @@ -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.4-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB) + javah -classpath ../../../../../../lib/accumulo-server-1.4.4.jar org.apache.accumulo.server.tabletserver.$(LIB) $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS) cp $(LIBS) $(INSTALL_DIR) http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/src/server/src/main/c++/nativeMap/Makefile ---------------------------------------------------------------------- diff --git a/src/server/src/main/c++/nativeMap/Makefile b/src/server/src/main/c++/nativeMap/Makefile index cd3c464..3a2adad 100644 --- a/src/server/src/main/c++/nativeMap/Makefile +++ b/src/server/src/main/c++/nativeMap/Makefile @@ -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.4-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap + javah -classpath ../../../../../../lib/accumulo-server-1.4.4.jar org.apache.accumulo.server.tabletserver.NativeMap $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS) cp $(LIBS) $(INSTALL_DIR) http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b783d14/src/server/src/main/resources/config.html ---------------------------------------------------------------------- diff --git a/src/server/src/main/resources/config.html b/src/server/src/main/resources/config.html index 20bcde5..7e57369 100644 --- a/src/server/src/main/resources/config.html +++ b/src/server/src/main/resources/config.html @@ -55,7 +55,7 @@ Shell - Apache Accumulo Interactive Shell - - - version: 1.4.4-SNAPSHOT + - version: 1.4.4 - instance name: ac14 - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181 -
