Permalink
Browse files

#ACCUMULO-970 updated trunk to 1.6.0-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1447838 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent dd7bd2f commit d5f8c03f4672d1e907587fa8477323423c97e1e3 @keith-turner keith-turner committed Feb 19, 2013
View
8 README
@@ -44,7 +44,7 @@ easier to install.
Copy the accumulo tar file produced by mvn package from the src/assemble/target/
directory to the desired destination, then untar it (e.g.
-tar xzf apache-accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
+tar xzf apache-accumulo-1.6.0-SNAPSHOT-dist.tar.gz).
If you are using the RPM, install the RPM on every machine that will run
accumulo.
@@ -71,7 +71,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.5.0-SNAPSHOT has been tested with hadoop version 0.20.2. To avoid data loss,
+1.6.0-SNAPSHOT has been tested with hadoop version 0.20.2. To avoid data loss,
you must enable HDFS durable sync. How you enable this depends on your version
of Hadoop. Please consult the table below for information regarding your version.
If you need to set the coniguration, please be sure to restart HDFS. See
@@ -182,7 +182,7 @@ scanned.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
@@ -203,7 +203,7 @@ certain column.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: accumulo
- instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
-
View
2 assemble/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
2 bin/config.sh
@@ -46,7 +46,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
export ACCUMULO_LOG_DIR
if [ -z "${ACCUMULO_VERSION}" ]; then
- ACCUMULO_VERSION=1.5.0-SNAPSHOT
+ ACCUMULO_VERSION=1.6.0-SNAPSHOT
fi
if [ -z "$HADOOP_PREFIX" ]
View
20 contrib/findbugs_build.xml
@@ -63,9 +63,9 @@
<pathElement location="${repository}/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar" />
<pathElement location="${repository}/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar" />
<!--pathElement location="${basedir}/../lib/jackson-0.9.2.jar" /-->
- <pathElement location="${basedir}/../lib/accumulo-fate-1.5.0-SNAPSHOT.jar" />
- <pathElement location="${basedir}/../lib/accumulo-start-1.5.0-SNAPSHOT.jar" />
- <pathElement location="${basedir}/../lib/accumulo-trace-1.5.0-SNAPSHOT.jar" />
+ <pathElement location="${basedir}/../lib/accumulo-fate-1.6.0-SNAPSHOT.jar" />
+ <pathElement location="${basedir}/../lib/accumulo-start-1.6.0-SNAPSHOT.jar" />
+ <pathElement location="${basedir}/../lib/accumulo-trace-1.6.0-SNAPSHOT.jar" />
</auxClasspath>
<sourcePath>
<pathElement location="${basedir}/core/src/main/java" />
@@ -83,13 +83,13 @@
<pathElement location="${basedir}/examples/simple/src/main/java" />
<pathElement location="${basedir}/examples/simple/src/test/java" />
</sourcePath>
- <class location="${basedir}/../lib/accumulo-core-1.5.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-fate-1.5.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-server-1.5.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-start-1.5.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-test-1.5.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-trace-1.5.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/examples-simple-1.5.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-core-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-fate-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-server-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-start-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-test-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-trace-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/examples-simple-1.6.0-SNAPSHOT.jar" />
</findbugs>
</target>
View
2 core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
2 core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -31,7 +31,7 @@
public class Constants {
public static final Charset UTF8 = Charset.forName("UTF-8");
- public static final String VERSION = "1.5.0-SNAPSHOT";
+ public static final String VERSION = "1.6.0-SNAPSHOT";
// versions should never be negative
public static final Integer WIRE_VERSION = 2;
View
2 core/src/main/resources/org/apache/accumulo/core/conf/config.html
@@ -55,7 +55,7 @@
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: ac14
- instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
-
View
2 docs/README_UBUNTU
@@ -3,7 +3,7 @@ following notes are not guaranteed since there are so many different server conf
Please let us know if anything is wrong or could be improved.
---------------------------
-- ACCUMULO 1.5.0-SNAPSHOT -
+- ACCUMULO 1.6.0-SNAPSHOT -
---------------------------
NOTE: These steps were tested on Ubuntu 12.04.1 LTS. 'file /sbin/init' displays this:
View
2 docs/combiners.html
@@ -30,7 +30,7 @@
<p><pre>
Shell - Apache Accumulo Interactive Shell
-- version: 1.5.0-SNAPSHOT
+- version: 1.6.0-SNAPSHOT
- instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
-
- type 'help' for a list of available commands
View
6 docs/examples/README.bloom
@@ -24,7 +24,7 @@ Below table named bloom_test is created and bloom filters are enabled.
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
@@ -102,7 +102,7 @@ The commands for creating the first table without bloom filters are below.
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
@@ -125,7 +125,7 @@ The commands for creating the second table with bloom filers are below.
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
2 docs/examples/README.combiner
@@ -29,7 +29,7 @@ tar distribution.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
2 docs/examples/README.constraints
@@ -31,7 +31,7 @@ the end shows the inserts were not allowed.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
2 docs/examples/README.mapred
@@ -33,7 +33,7 @@ for the column family count.
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
2 docs/examples/README.maxmutation
@@ -27,7 +27,7 @@ large mutations.
Shell - Apache Accumulo Interactive Shell
-
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
2 docs/examples/README.regex
@@ -24,7 +24,7 @@ put a trivial amount of data into accumulo using the accumulo shell:
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
4 docs/examples/README.rowhash
@@ -24,7 +24,7 @@ put a trivial amount of data into accumulo using the accumulo shell:
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
@@ -44,7 +44,7 @@ Now we can scan the table and see the hashes:
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
2 docs/examples/README.tabletofile
@@ -23,7 +23,7 @@ put a trivial amount of data into accumulo using the accumulo shell:
$ ./bin/accumulo shell -u username -p password
Shell - Apache Accumulo Interactive Shell
- - version: 1.5.0-SNAPSHOT
+ - version: 1.6.0-SNAPSHOT
- instance name: instance
- instance id: 00000000-0000-0000-0000-000000000000
-
View
4 examples/instamo/pom.xml
@@ -20,11 +20,11 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-instamo</artifactId>
<packaging>jar</packaging>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>Instamo Example</name>
<url>http://maven.apache.org</url>
<properties>
- <accumulo.version>1.5.0-SNAPSHOT</accumulo.version>
+ <accumulo.version>1.6.0-SNAPSHOT</accumulo.version>
<hadoop-one.version>1.0.4</hadoop-one.version>
<hadoop-two.version>2.0.2-alpha</hadoop-two.version>
<maclass>org.apache.accumulo.instamo.MapReduceExample</maclass>
View
2 examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>accumulo</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-examples</artifactId>
<packaging>pom</packaging>
View
2 examples/simple/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
2 fate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
18 pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>Apache Accumulo</name>
<prerequisites>
<maven>2.2.0</maven>
@@ -594,42 +594,42 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-trace</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-fate</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<!-- additional dependencies we need to provide -->
View
4 proxy/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>accumulo</artifactId>
<groupId>org.apache.accumulo</groupId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Proxy</name>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-instamo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
View
2 server/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
2 server/src/main/c++/nativeMap/Makefile
@@ -56,7 +56,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.5.0-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+ javah -classpath ../../../../../lib/accumulo-server-1.6.0-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
$(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
cp $(LIBS) $(INSTALL_DIR)
View
2 start/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
4 test/compat/japi-compliance/japi-accumulo-1.5.xml
@@ -1,9 +1,9 @@
<version>
- 1.5.0-SNAPSHOT
+ 1.6.0-SNAPSHOT
</version>
<archives>
- ../../../lib/accumulo-core-1.5.0-SNAPSHOT.jar
+ ../../../lib/accumulo-core-1.6.0-SNAPSHOT.jar
</archives>
<skip_packages>
View
2 test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
2 trace/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

0 comments on commit d5f8c03

Please sign in to comment.