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 2013/08/30 17:08:50 UTC
git commit: ACCUMULO-1546 sliding the version since 1.4.4 has been
released
Updated Branches:
refs/heads/1.4.4-SNAPSHOT 351ad6e83 -> b1a330c32
ACCUMULO-1546 sliding the version since 1.4.4 has been released
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1a330c3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1a330c3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1a330c3
Branch: refs/heads/1.4.4-SNAPSHOT
Commit: b1a330c32ea86f07c6a0b5907120b1198b817b29
Parents: 351ad6e
Author: Eric Newton <ec...@apache.org>
Authored: Fri Aug 30 11:09:00 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Fri Aug 30 11:09:00 2013 -0400
----------------------------------------------------------------------
README | 8 ++++----
bin/config.sh | 2 +-
docs/combiners.html | 2 +-
docs/config.html | 2 +-
pom.xml | 12 ++++++------
src/core/pom.xml | 2 +-
.../main/java/org/apache/accumulo/core/Constants.java | 2 +-
src/examples/pom.xml | 2 +-
src/examples/simple/pom.xml | 2 +-
src/examples/wikisearch/ingest/bin/ingest.sh | 2 +-
src/examples/wikisearch/ingest/bin/ingest_parallel.sh | 2 +-
src/examples/wikisearch/ingest/pom.xml | 2 +-
src/examples/wikisearch/pom.xml | 2 +-
src/examples/wikisearch/query-war/pom.xml | 2 +-
src/examples/wikisearch/query/pom.xml | 2 +-
src/minicluster/pom.xml | 2 +-
src/proxy/pom.xml | 2 +-
src/server/pom.xml | 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 +-
src/start/pom.xml | 2 +-
src/trace/pom.xml | 2 +-
23 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/README
----------------------------------------------------------------------
diff --git a/README b/README
index 8cfbd53..ebe89e4 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.5-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 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.5-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.4-SNAPSHOT
+ - version: 1.4.5-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.4-SNAPSHOT
+ - version: 1.4.5-SNAPSHOT
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index a89115a..9277406 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.5-SNAPSHOT
fi
if [ -z "$HADOOP_HOME" ]
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/docs/combiners.html
----------------------------------------------------------------------
diff --git a/docs/combiners.html b/docs/combiners.html
index 98b91d3..8524b52 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.5-SNAPSHOT
- 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/b1a330c3/docs/config.html
----------------------------------------------------------------------
diff --git a/docs/config.html b/docs/config.html
index 97c2c6b..01d2e14 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.5-SNAPSHOT
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ea1627..d427da8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<name>accumulo</name>
<modules>
@@ -682,27 +682,27 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
</dependency>
<!-- additional dependencies we need to provide -->
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/core/pom.xml
----------------------------------------------------------------------
diff --git a/src/core/pom.xml b/src/core/pom.xml
index 967dc81..d7aa1fc 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/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..c85649d 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.5-SNAPSHOT";
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/b1a330c3/src/examples/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/pom.xml b/src/examples/pom.xml
index abe652c..2d56be6 100644
--- a/src/examples/pom.xml
+++ b/src/examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>accumulo-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/simple/pom.xml b/src/examples/simple/pom.xml
index 0323c11..1df99a1 100644
--- a/src/examples/simple/pom.xml
+++ b/src/examples/simple/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/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..acdcbf8 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.5-SNAPSHOT.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/b1a330c3/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..8c63ac0 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.5-SNAPSHOT.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/b1a330c3/src/examples/wikisearch/ingest/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/wikisearch/ingest/pom.xml b/src/examples/wikisearch/ingest/pom.xml
index f2a8f77..29b2047 100644
--- a/src/examples/wikisearch/ingest/pom.xml
+++ b/src/examples/wikisearch/ingest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/examples/wikisearch/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/wikisearch/pom.xml b/src/examples/wikisearch/pom.xml
index 1036436..1ea9a2a 100644
--- a/src/examples/wikisearch/pom.xml
+++ b/src/examples/wikisearch/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-examples</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>accumulo-wikisearch</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/examples/wikisearch/query-war/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/wikisearch/query-war/pom.xml b/src/examples/wikisearch/query-war/pom.xml
index 555f995..485d584 100644
--- a/src/examples/wikisearch/query-war/pom.xml
+++ b/src/examples/wikisearch/query-war/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
</parent>
<artifactId>wikisearch-query-war</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/examples/wikisearch/query/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/wikisearch/query/pom.xml b/src/examples/wikisearch/query/pom.xml
index 9d20269..05b1e46 100644
--- a/src/examples/wikisearch/query/pom.xml
+++ b/src/examples/wikisearch/query/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>accumulo-wikisearch</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/src/minicluster/pom.xml b/src/minicluster/pom.xml
index 198d1f7..bb85148 100644
--- a/src/minicluster/pom.xml
+++ b/src/minicluster/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml
index cc54f82..5f2afc2 100644
--- a/src/proxy/pom.xml
+++ b/src/proxy/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>accumulo</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>accumulo-proxy</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/server/pom.xml
----------------------------------------------------------------------
diff --git a/src/server/pom.xml b/src/server/pom.xml
index 8de12fe..6421bc6 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/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..932ac86 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.5-SNAPSHOT.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/b1a330c3/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..56fe773 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.5-SNAPSHOT.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/b1a330c3/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..f63c5c0 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.5-SNAPSHOT
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/start/pom.xml
----------------------------------------------------------------------
diff --git a/src/start/pom.xml b/src/start/pom.xml
index 66a2dc0..98d9d47 100644
--- a/src/start/pom.xml
+++ b/src/start/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1a330c3/src/trace/pom.xml
----------------------------------------------------------------------
diff --git a/src/trace/pom.xml b/src/trace/pom.xml
index 28b1c72..1ee00a3 100644
--- a/src/trace/pom.xml
+++ b/src/trace/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>