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 2011/12/27 14:41:17 UTC
svn commit: r1224907 - in /incubator/accumulo/branches/1.3: ./ bin/ docs/
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/resourc...
Author: ecn
Date: Tue Dec 27 13:41:17 2011
New Revision: 1224907
URL: http://svn.apache.org/viewvc?rev=1224907&view=rev
Log:
ACCUMULO-86 increment release number in the 1.3 branch
Modified:
incubator/accumulo/branches/1.3/README
incubator/accumulo/branches/1.3/bin/config.sh
incubator/accumulo/branches/1.3/docs/aggregation.html
incubator/accumulo/branches/1.3/docs/config.html
incubator/accumulo/branches/1.3/docs/mockAccumulo.html
incubator/accumulo/branches/1.3/pom.xml
incubator/accumulo/branches/1.3/src/core/pom.xml
incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java
incubator/accumulo/branches/1.3/src/examples/pom.xml
incubator/accumulo/branches/1.3/src/server/pom.xml
incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile
incubator/accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile
incubator/accumulo/branches/1.3/src/server/src/main/resources/config.html
incubator/accumulo/branches/1.3/src/start/pom.xml
incubator/accumulo/branches/1.3/src/trace/pom.xml
Modified: incubator/accumulo/branches/1.3/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/README?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/README (original)
+++ incubator/accumulo/branches/1.3/README Tue Dec 27 13:41:17 2011
@@ -15,7 +15,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.5-incubating-SNAPSHOT-dist.tar.gz).
+tar xvzf accumulo-1.3.6-incubating-SNAPSHOT-dist.tar.gz).
If you are using the RPM, install the RPM on every machine that will run
accumulo.
@@ -32,7 +32,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.3.5-incubating-SNAPSHOT has been tested with hadoop version 0.20.1 and 0.20.2.
+Accumulo 1.3.6-incubating-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
where tablet servers and loggers will run.
@@ -98,7 +98,7 @@ scanned.
Shell - Accumulo Interactive Shell
-
- - version: 1.3.5-incubating-SNAPSHOT
+ - version: 1.3.6-incubating-SNAPSHOT
- instance name: acu13
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
@@ -119,7 +119,7 @@ certain column.
Shell - Accumulo Interactive Shell
-
- - version: 1.3.5-incubating-SNAPSHOT
+ - version: 1.3.6-incubating-SNAPSHOT
- instance name: acu13
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
Modified: incubator/accumulo/branches/1.3/bin/config.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/bin/config.sh?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/bin/config.sh (original)
+++ incubator/accumulo/branches/1.3/bin/config.sh Tue Dec 27 13:41:17 2011
@@ -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.5-incubating-SNAPSHOT
+ ACCUMULO_VERSION=1.3.6-incubating-SNAPSHOT
fi
if [ -z "$HADOOP_HOME" ]
Modified: incubator/accumulo/branches/1.3/docs/aggregation.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/docs/aggregation.html?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/docs/aggregation.html (original)
+++ incubator/accumulo/branches/1.3/docs/aggregation.html Tue Dec 27 13:41:17 2011
@@ -29,7 +29,7 @@
<p><pre>
Shell - Accumulo Interactive Shell
-- version: 1.3.5-incubating-SNAPSHOT
+- version: 1.3.6-incubating-SNAPSHOT
- instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
-
- type 'help' for a list of available commands
Modified: incubator/accumulo/branches/1.3/docs/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/docs/config.html?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/docs/config.html (original)
+++ incubator/accumulo/branches/1.3/docs/config.html Tue Dec 27 13:41:17 2011
@@ -55,7 +55,7 @@
Shell - Accumulo Interactive Shell
-
- - version: 1.3.5-incubating-SNAPSHOT
+ - version: 1.3.6-incubating-SNAPSHOT
- instance name: ac13
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: incubator/accumulo/branches/1.3/docs/mockAccumulo.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/docs/mockAccumulo.html?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/docs/mockAccumulo.html (original)
+++ incubator/accumulo/branches/1.3/docs/mockAccumulo.html Tue Dec 27 13:41:17 2011
@@ -47,7 +47,7 @@ $ ./bin/accumulo shell --fake -u root -p
Shell - Accumulo Interactive Shell
-
-- version: 1.3.5-incubating-SNAPSHOT
+- version: 1.3.6-incubating-SNAPSHOT
- instance name: mock-instance
- instance id: mock-instance-id
-
Modified: incubator/accumulo/branches/1.3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/pom.xml?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/pom.xml (original)
+++ incubator/accumulo/branches/1.3/pom.xml Tue Dec 27 13:41:17 2011
@@ -29,7 +29,7 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
<name>accumulo</name>
<url>http://incubator.apache.org/accumulo</url>
@@ -521,22 +521,22 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
</dependency>
<!-- additional dependencies we need to provide -->
Modified: incubator/accumulo/branches/1.3/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/pom.xml?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/core/pom.xml Tue Dec 27 13:41:17 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java Tue Dec 27 13:41:17 2011
@@ -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.5-incubating-SNAPSHOT";
+ public static final String VERSION = "1.3.6-incubating-SNAPSHOT";
public static final int DATA_VERSION = 3;
// Zookeeper locations
Modified: incubator/accumulo/branches/1.3/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/examples/pom.xml?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/examples/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/examples/pom.xml Tue Dec 27 13:41:17 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.3/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/pom.xml?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/server/pom.xml Tue Dec 27 13:41:17 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/Makefile Tue Dec 27 13:41:17 2011
@@ -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.5-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+ javah -classpath ../../../../../../lib/accumulo-server-1.3.6-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: incubator/accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/c++/nativeMap/Makefile Tue Dec 27 13:41:17 2011
@@ -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.5-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+ javah -classpath ../../../../../../lib/accumulo-server-1.3.6-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
Modified: incubator/accumulo/branches/1.3/src/server/src/main/resources/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/resources/config.html?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/resources/config.html (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/resources/config.html Tue Dec 27 13:41:17 2011
@@ -55,7 +55,7 @@
Shell - Accumulo Interactive Shell
-
- - version: 1.3.5-incubating-SNAPSHOT
+ - version: 1.3.6-incubating-SNAPSHOT
- instance name: ac13
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
Modified: incubator/accumulo/branches/1.3/src/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/start/pom.xml?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/start/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/start/pom.xml Tue Dec 27 13:41:17 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
Modified: incubator/accumulo/branches/1.3/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/trace/pom.xml?rev=1224907&r1=1224906&r2=1224907&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/trace/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/trace/pom.xml Tue Dec 27 13:41:17 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.3.5-incubating-SNAPSHOT</version>
+ <version>1.3.6-incubating-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>