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 7F63510407 for ; Fri, 4 Apr 2014 20:34:13 +0000 (UTC) Received: (qmail 6025 invoked by uid 500); 4 Apr 2014 20:33:58 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 5831 invoked by uid 500); 4 Apr 2014 20:33:54 -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 5493 invoked by uid 99); 4 Apr 2014 20:33:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 20:33:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C503C943262; Fri, 4 Apr 2014 20:33:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 04 Apr 2014 20:33:53 -0000 Message-Id: <6d35e56088d94901a2cc240d06353866@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/19] git commit: ACCUMULO-2169 Replace 1.4.5 with 1.4.6-SNAPSHOT ACCUMULO-2169 Replace 1.4.5 with 1.4.6-SNAPSHOT find . -type f -not -path './.git/*' -exec sed -i 's/1[.]4[.]5/1.4.6-SNAPSHOT/' {} \; Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83e65f27 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83e65f27 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83e65f27 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 83e65f279e82759cf91d4d487c9e305b9515e4f0 Parents: f7d87b6 Author: Mike Drob Authored: Mon Mar 24 22:31:19 2014 -0400 Committer: Mike Drob Committed: Fri Apr 4 11:23:27 2014 -0700 ---------------------------------------------------------------------- README | 6 +++--- bin/config.sh | 2 +- docs/combiners.html | 2 +- docs/config.html | 2 +- pom.xml | 2 +- src/core/pom.xml | 2 +- src/core/src/main/java/org/apache/accumulo/core/Constants.java | 2 +- src/examples/pom.xml | 2 +- src/examples/simple/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 +- 17 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/README ---------------------------------------------------------------------- diff --git a/README b/README index 2552d70..33f436f 100644 --- a/README +++ b/README @@ -49,7 +49,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.5-dist.tar.gz). +tar xvzf accumulo-1.4.6-SNAPSHOT-dist.tar.gz). If you are using the RPM/deb, install the RPM/deb on every machine that will run accumulo. @@ -178,7 +178,7 @@ scanned. Shell - Apache Accumulo Interactive Shell - - - version: 1.4.5 + - version: 1.4.6-SNAPSHOT - instance name: accumulo - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f - @@ -199,7 +199,7 @@ certain column. Shell - Apache Accumulo Interactive Shell - - - version: 1.4.5 + - version: 1.4.6-SNAPSHOT - instance name: accumulo - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f - http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/bin/config.sh ---------------------------------------------------------------------- diff --git a/bin/config.sh b/bin/config.sh index 3dd7976..eba3bca 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -87,7 +87,7 @@ fi export ACCUMULO_LOG_DIR if [ -z ${ACCUMULO_VERSION} ]; then - ACCUMULO_VERSION=1.4.5 + ACCUMULO_VERSION=1.4.6-SNAPSHOT fi if [ -z "$HADOOP_PREFIX" ] http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/docs/combiners.html ---------------------------------------------------------------------- diff --git a/docs/combiners.html b/docs/combiners.html index 1c4293b..c4e72ec 100644 --- a/docs/combiners.html +++ b/docs/combiners.html @@ -30,7 +30,7 @@ 

 
 Shell - Apache Accumulo Interactive Shell
-- version: 1.4.5
+- version: 1.4.6-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/83e65f27/docs/config.html
----------------------------------------------------------------------
diff --git a/docs/config.html b/docs/config.html
index 515de47..ea0ade3 100644
--- a/docs/config.html
+++ b/docs/config.html
@@ -55,7 +55,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.4.5
+    - version: 1.4.6-SNAPSHOT
     - instance name: ac14
     - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
     - 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 15c81c8..87c50b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
   org.apache.accumulo
   accumulo
   pom
-  1.4.5
+  1.4.6-SNAPSHOT
   accumulo
 
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/core/pom.xml
----------------------------------------------------------------------
diff --git a/src/core/pom.xml b/src/core/pom.xml
index 9a94080..b310764 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.5
+    1.4.6-SNAPSHOT
     ../../
   
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/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 a7a2ef1..a7fceda 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
@@ -31,7 +31,7 @@ import org.apache.hadoop.io.Text;
 
 public class Constants {
   public static final Charset UTF8 = Charset.forName("UTF-8");
-  public static final String VERSION = "1.4.5";
+  public static final String VERSION = "1.4.6-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/83e65f27/src/examples/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/pom.xml b/src/examples/pom.xml
index 7a8de8b..3a74784 100644
--- a/src/examples/pom.xml
+++ b/src/examples/pom.xml
@@ -20,7 +20,7 @@
   
         accumulo
         org.apache.accumulo
-        1.4.5
+        1.4.6-SNAPSHOT
         ../../
   
   accumulo-examples

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/src/examples/simple/pom.xml b/src/examples/simple/pom.xml
index 3b1b22a..4c4ce0b 100644
--- a/src/examples/simple/pom.xml
+++ b/src/examples/simple/pom.xml
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo-examples
-    1.4.5
+    1.4.6-SNAPSHOT
     ../
   
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/src/minicluster/pom.xml b/src/minicluster/pom.xml
index 3cb5e24..cc8a4be 100644
--- a/src/minicluster/pom.xml
+++ b/src/minicluster/pom.xml
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.5
+    1.4.6-SNAPSHOT
     ../../
   
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml
index 68b9d73..90f74f0 100644
--- a/src/proxy/pom.xml
+++ b/src/proxy/pom.xml
@@ -21,7 +21,7 @@
   
     accumulo
     org.apache.accumulo
-    1.4.5
+    1.4.6-SNAPSHOT
     ../../
   
   accumulo-proxy

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/server/pom.xml
----------------------------------------------------------------------
diff --git a/src/server/pom.xml b/src/server/pom.xml
index 18010f2..dbe4fb4 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.5
+    1.4.6-SNAPSHOT
     ../../
   
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/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 8520673..cb0609b 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.5.jar org.apache.accumulo.server.tabletserver.$(LIB)
+	javah -classpath ../../../../../../lib/accumulo-server-1.4.6-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/83e65f27/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 ee6eeaf..537c53b 100644
--- a/src/server/src/main/c++/nativeMap/Makefile
+++ b/src/server/src/main/c++/nativeMap/Makefile
@@ -40,7 +40,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.5.jar org.apache.accumulo.server.tabletserver.NativeMap
+	javah -classpath ../../../../../../lib/accumulo-server-1.4.6-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/83e65f27/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 a06988d..0387103 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.5
+    - version: 1.4.6-SNAPSHOT
     - instance name: ac14
     - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
     - 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/start/pom.xml
----------------------------------------------------------------------
diff --git a/src/start/pom.xml b/src/start/pom.xml
index 995241e..bcd5feb 100644
--- a/src/start/pom.xml
+++ b/src/start/pom.xml
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.5
+    1.4.6-SNAPSHOT
     ../../
   
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83e65f27/src/trace/pom.xml
----------------------------------------------------------------------
diff --git a/src/trace/pom.xml b/src/trace/pom.xml
index ff3f1fd..cd66f55 100644
--- a/src/trace/pom.xml
+++ b/src/trace/pom.xml
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.5
+    1.4.6-SNAPSHOT
     ../../