Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 26A12D406 for ; Mon, 11 Mar 2013 14:22:56 +0000 (UTC) Received: (qmail 71307 invoked by uid 500); 11 Mar 2013 14:21:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 69223 invoked by uid 500); 11 Mar 2013 14:21:19 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 64337 invoked by uid 99); 11 Mar 2013 14:20:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 14:20:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 14:20:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0191A2388847; Mon, 11 Mar 2013 14:19:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1455158 - 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/query-war/ sr... Date: Mon, 11 Mar 2013 14:19:52 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130311141953.0191A2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Mon Mar 11 14:19:51 2013 New Revision: 1455158 URL: http://svn.apache.org/r1455158 Log: ACCUMULO-1168 moving 1.4 branch to 1.4.4-SNAPSHOT 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/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=1455158&r1=1455157&r2=1455158&view=diff ============================================================================== --- accumulo/branches/1.4/README (original) +++ accumulo/branches/1.4/README Mon Mar 11 14:19:51 2013 @@ -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.3-SNAPSHOT-dist.tar.gz). +tar xvzf accumulo-1.4.4-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.3-SNAPSHOT has been tested with hadoop version 0.20.2. +Accumulo 1.4.4-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.3-SNAPSHOT + - version: 1.4.4-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.3-SNAPSHOT + - version: 1.4.4-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=1455158&r1=1455157&r2=1455158&view=diff ============================================================================== --- accumulo/branches/1.4/bin/config.sh (original) +++ accumulo/branches/1.4/bin/config.sh Mon Mar 11 14:19:51 2013 @@ -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.3-SNAPSHOT + ACCUMULO_VERSION=1.4.4-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=1455158&r1=1455157&r2=1455158&view=diff ============================================================================== --- accumulo/branches/1.4/docs/combiners.html (original) +++ accumulo/branches/1.4/docs/combiners.html Mon Mar 11 14:19:51 2013 @@ -30,7 +30,7 @@

 
 Shell - Apache Accumulo Interactive Shell
-- version: 1.4.3-SNAPSHOT
+- version: 1.4.4-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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/docs/config.html (original)
+++ accumulo/branches/1.4/docs/config.html Mon Mar 11 14:19:51 2013
@@ -55,7 +55,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.4.3-SNAPSHOT
+    - version: 1.4.4-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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/pom.xml (original)
+++ accumulo/branches/1.4/pom.xml Mon Mar 11 14:19:51 2013
@@ -27,7 +27,7 @@
   org.apache.accumulo
   accumulo
   pom
-  1.4.3-SNAPSHOT
+  1.4.4-SNAPSHOT
   accumulo
 
   
@@ -680,22 +680,22 @@
       
         org.apache.accumulo
         cloudtrace
-        1.4.3-SNAPSHOT
+        1.4.4-SNAPSHOT
       
       
         org.apache.accumulo
         accumulo-start
-        1.4.3-SNAPSHOT
+        1.4.4-SNAPSHOT
       
       
         org.apache.accumulo
         accumulo-core
-        1.4.3-SNAPSHOT
+        1.4.4-SNAPSHOT
       
       
         org.apache.accumulo
         accumulo-server
-        1.4.3-SNAPSHOT
+        1.4.4-SNAPSHOT
       
 
       

Modified: accumulo/branches/1.4/src/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/pom.xml?rev=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/pom.xml (original)
+++ accumulo/branches/1.4/src/core/pom.xml Mon Mar 11 14:19:51 2013
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../../
   
 

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=1455158&r1=1455157&r2=1455158&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 Mon Mar 11 14:19:51 2013
@@ -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.3-SNAPSHOT";
+  public static final String VERSION = "1.4.4-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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/pom.xml Mon Mar 11 14:19:51 2013
@@ -20,7 +20,7 @@
   
         accumulo
         org.apache.accumulo
-        1.4.3-SNAPSHOT
+        1.4.4-SNAPSHOT
         ../../
   
   accumulo-examples

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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/simple/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/simple/pom.xml Mon Mar 11 14:19:51 2013
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo-examples
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../
   
 

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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml Mon Mar 11 14:19:51 2013
@@ -20,7 +20,7 @@
   
     accumulo-wikisearch
     org.apache.accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../
   
 

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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/pom.xml Mon Mar 11 14:19:51 2013
@@ -20,7 +20,7 @@
   
         accumulo-examples
         org.apache.accumulo
-        1.4.3-SNAPSHOT
+        1.4.4-SNAPSHOT
         ../
   
   accumulo-wikisearch

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=1455158&r1=1455157&r2=1455158&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 Mon Mar 11 14:19:51 2013
@@ -20,7 +20,7 @@
   
     accumulo-wikisearch
     org.apache.accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
   
 
   wikisearch-query-war

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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml (original)
+++ accumulo/branches/1.4/src/examples/wikisearch/query/pom.xml Mon Mar 11 14:19:51 2013
@@ -19,7 +19,7 @@
   
     accumulo-wikisearch
     org.apache.accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../
   
 

Modified: accumulo/branches/1.4/src/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/pom.xml?rev=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/server/pom.xml (original)
+++ accumulo/branches/1.4/src/server/pom.xml Mon Mar 11 14:19:51 2013
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../../
   
 

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=1455158&r1=1455157&r2=1455158&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 Mon Mar 11 14:19:51 2013
@@ -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.3-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+	javah -classpath ../../../../../../lib/accumulo-server-1.4.4-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=1455158&r1=1455157&r2=1455158&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 Mon Mar 11 14:19:51 2013
@@ -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.3-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+	javah -classpath ../../../../../../lib/accumulo-server-1.4.4-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=1455158&r1=1455157&r2=1455158&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 Mon Mar 11 14:19:51 2013
@@ -55,7 +55,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.4.3-SNAPSHOT
+    - version: 1.4.4-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=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/start/pom.xml (original)
+++ accumulo/branches/1.4/src/start/pom.xml Mon Mar 11 14:19:51 2013
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../../
   
 

Modified: accumulo/branches/1.4/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/trace/pom.xml?rev=1455158&r1=1455157&r2=1455158&view=diff
==============================================================================
--- accumulo/branches/1.4/src/trace/pom.xml (original)
+++ accumulo/branches/1.4/src/trace/pom.xml Mon Mar 11 14:19:51 2013
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.3-SNAPSHOT
+    1.4.4-SNAPSHOT
     ../../