accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject [1/3] git commit: ACCUMULO-2169 Replace 1.4.5 with 1.4.6-SNAPSHOT
Date Mon, 24 Mar 2014 17:35:21 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.4.5-RC1 [created] e022d7614


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/e022d761
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e022d761
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e022d761

Branch: refs/heads/1.4.5-RC1
Commit: e022d761482e5d9b42adfbe30099c74c466751f1
Parents: 81babc0
Author: Mike Drob <mdrob@cloudera.com>
Authored: Thu Jan 9 18:34:14 2014 -0800
Committer: Mike Drob <mdrob@cloudera.com>
Committed: Mon Mar 24 13:34:57 2014 -0400

----------------------------------------------------------------------
 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/e022d761/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/e022d761/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/e022d761/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 @@
 <p><pre>
 
 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/e022d761/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/e022d761/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 15c81c8..87c50b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
   <groupId>org.apache.accumulo</groupId>
   <artifactId>accumulo</artifactId>
   <packaging>pom</packaging>
-  <version>1.4.5</version>
+  <version>1.4.6-SNAPSHOT</version>
   <name>accumulo</name>
 
   <modules>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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/e022d761/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 @@
   <parent>
         <artifactId>accumulo</artifactId>
         <groupId>org.apache.accumulo</groupId>
-        <version>1.4.5</version>
+        <version>1.4.6-SNAPSHOT</version>
         <relativePath>../../</relativePath>
   </parent>
   <artifactId>accumulo-examples</artifactId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo-examples</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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 @@
   <parent>
     <artifactId>accumulo</artifactId>
     <groupId>org.apache.accumulo</groupId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>accumulo-proxy</artifactId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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/e022d761/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/e022d761/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/e022d761/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 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e022d761/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 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 


Mime
View raw message