Restoring tag for hbase-0.96.1 (originally done by stack, 12/16/13)


git-svn-id: https://svn.apache.org/repos/asf/hbase/tags/0.96.1@1552432 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 53e2e62..2798aec 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,5 @@
 HBase Change Log
 
-Release 0.96.1.1 - Release Candidate - Tue Dec 17, 2013
-1 issue close/resolved.  See http://goo.gl/q4S94X for list.
-
 Release 0.96.1 - Release Candidate - Tue Nov 27, 2013
 126 issues closed/resolved.  See http://goo.gl/ZgYBW2 for list.
 
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index d615edd..caa7dbc 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.96.1.1</version>
+        <version>0.96.1</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 164a7e3..88cb336 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
index 06a6529..41e39a3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
@@ -94,11 +94,7 @@
   private byte [] bytes;
   public static final List<ServerName> EMPTY_SERVER_LIST = new ArrayList<ServerName>(0);
 
-  /**
-   * @deprecated since 0.96, made private in 0.98. use {@link #valueOf(String, int, long)} instead.
-   */
-  @Deprecated
-  public ServerName(final String hostname, final int port, final long startcode) {
+  private ServerName(final String hostname, final int port, final long startcode) {
     // Drop the domain is there is one; no need of it in a local cluster.  With it, we get long
     // unwieldy names.
     this.hostnameOnly = hostname;
@@ -118,20 +114,12 @@
     return parts[0];
   }
 
-  /**
-   * @deprecated since 0.96, made private in 0.98. use {@link #valueOf(String)} instead.
-   */
-  @Deprecated
-  public ServerName(final String serverName) {
+  private ServerName(final String serverName) {
     this(parseHostname(serverName), parsePort(serverName),
       parseStartcode(serverName));
   }
 
-  /**
-   * @deprecated since 0.96, made private in 0.98+. use {@link #valueOf(String, long)} instead.
-   */
-  @Deprecated
-  public ServerName(final String hostAndPort, final long startCode) {
+  private ServerName(final String hostAndPort, final long startCode) {
     this(Addressing.parseHostname(hostAndPort),
       Addressing.parsePort(hostAndPort), startCode);
   }
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index b79d453..14ec469 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index ac049b4..0aed1e2 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-examples</artifactId>
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index cd8e764..842a35f 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.96.1.1</version>
+        <version>0.96.1</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/hbase-hadoop1-compat/pom.xml b/hbase-hadoop1-compat/pom.xml
index c949d0a..23edff3 100644
--- a/hbase-hadoop1-compat/pom.xml
+++ b/hbase-hadoop1-compat/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index 8d40f50..da4cbb5 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 25daa67..2364375 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index 4461327..4f34690 100644
--- a/hbase-prefix-tree/pom.xml
+++ b/hbase-prefix-tree/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml
index b11e139..acfaa70 100644
--- a/hbase-protocol/pom.xml
+++ b/hbase-protocol/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.96.1.1</version>
+        <version>0.96.1</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 06f51a3..f995c51 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-server</artifactId>
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 6059587..49cd699 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-shell</artifactId>
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index 7ab7567..1be89ff 100644
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>hbase</artifactId>
         <groupId>org.apache.hbase</groupId>
-        <version>0.96.1.1</version>
+        <version>0.96.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>hbase-testing-util</artifactId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index a67e11f..d7f4f99 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>hbase</artifactId>
     <groupId>org.apache.hbase</groupId>
-    <version>0.96.1.1</version>
+    <version>0.96.1</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>hbase-thrift</artifactId>
diff --git a/pom.xml b/pom.xml
index d9e94b4..b97d2b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
   <groupId>org.apache.hbase</groupId>
   <artifactId>hbase</artifactId>
   <packaging>pom</packaging>
-  <version>0.96.1.1</version>
+  <version>0.96.1</version>
   <name>HBase</name>
   <description>
     Apache HBase™ is the Hadoop database. Use it when you need