http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncProcess.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncProcess.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncProcess.html
index c38e112..ab61235 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncProcess.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncProcess.html
@@ -28,7 +28,7 @@
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
 <span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.23"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.23"></a>
 <span class="sourceLineNo">024</span><a name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.IOException;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.io.InterruptedIOException;<a 
name="line.26"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
index 48ea40e..5dcc5c2 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
@@ -27,7 +27,7 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.InterruptedIOException;<a 
name="line.25"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
index 48ea40e..5dcc5c2 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
@@ -27,7 +27,7 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.InterruptedIOException;<a 
name="line.25"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
index 48ea40e..5dcc5c2 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
@@ -27,7 +27,7 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.InterruptedIOException;<a 
name="line.25"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
index 48ea40e..5dcc5c2 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
@@ -27,7 +27,7 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.InterruptedIOException;<a 
name="line.25"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
index 48ea40e..5dcc5c2 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
@@ -27,7 +27,7 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.InterruptedIOException;<a 
name="line.25"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.AdminRequestCallerBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.AdminRequestCallerBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.AdminRequestCallerBuilder.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.AdminRequestCallerBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.AdminRequestCallerBuilder.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BatchCallerBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BatchCallerBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BatchCallerBuilder.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BatchCallerBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BatchCallerBuilder.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BuilderBase.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BuilderBase.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BuilderBase.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BuilderBase.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.BuilderBase.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.MasterRequestCallerBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.MasterRequestCallerBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.MasterRequestCallerBuilder.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.MasterRequestCallerBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.MasterRequestCallerBuilder.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ScanSingleRegionCallerBuilder.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ServerRequestCallerBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ServerRequestCallerBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ServerRequestCallerBuilder.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ServerRequestCallerBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.ServerRequestCallerBuilder.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.SingleRequestCallerBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.SingleRequestCallerBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.SingleRequestCallerBuilder.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.SingleRequestCallerBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.SingleRequestCallerBuilder.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.html
index 1ffdea8..299be0c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRpcRetryingCallerFactory.html
@@ -25,8 +25,8 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import static 
com.google.common.base.Preconditions.checkArgument;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
com.google.common.base.Preconditions.checkNotNull;<a name="line.21"></a>
+<span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkArgument;<a
 name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.checkNotNull;<a
 name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.retries2Attempts;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import io.netty.util.HashedWheelTimer;<a 
name="line.24"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerImpl.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerImpl.html
index f4bd3ce..c21aec6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerImpl.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateResultsMetrics;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMetrics;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
com.google.common.base.Preconditions;<a name="line.31"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span><a name="line.32"></a>
 <span class="sourceLineNo">033</span>import io.netty.util.HashedWheelTimer;<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>import io.netty.util.Timeout;<a 
name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html
index f4bd3ce..c21aec6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateResultsMetrics;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMetrics;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
com.google.common.base.Preconditions;<a name="line.31"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span><a name="line.32"></a>
 <span class="sourceLineNo">033</span>import io.netty.util.HashedWheelTimer;<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>import io.netty.util.Timeout;<a 
name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerImpl.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerImpl.html
index f4bd3ce..c21aec6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerImpl.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateResultsMetrics;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMetrics;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
com.google.common.base.Preconditions;<a name="line.31"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span><a name="line.32"></a>
 <span class="sourceLineNo">033</span>import io.netty.util.HashedWheelTimer;<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>import io.netty.util.Timeout;<a 
name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html
index f4bd3ce..c21aec6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateResultsMetrics;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMetrics;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
com.google.common.base.Preconditions;<a name="line.31"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span><a name="line.32"></a>
 <span class="sourceLineNo">033</span>import io.netty.util.HashedWheelTimer;<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>import io.netty.util.Timeout;<a 
name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.html
index f4bd3ce..c21aec6 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.html
@@ -36,7 +36,7 @@
 <span class="sourceLineNo">028</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateResultsMetrics;<a 
name="line.28"></a>
 <span class="sourceLineNo">029</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.updateServerSideMetrics;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
com.google.common.base.Preconditions;<a name="line.31"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span><a name="line.32"></a>
 <span class="sourceLineNo">033</span>import io.netty.util.HashedWheelTimer;<a 
name="line.33"></a>
 <span class="sourceLineNo">034</span>import io.netty.util.Timeout;<a 
name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
index da6c0fb..8a2ddbd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html
@@ -29,7 +29,7 @@
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.allOf;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.toCheckExistenceOnly;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
com.google.common.base.Preconditions;<a name="line.24"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.util.List;<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span>import 
java.util.concurrent.CompletableFuture;<a name="line.27"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
index ec686a8..9d39e8d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableResultScanner.html
@@ -27,8 +27,8 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
com.google.common.base.Throwables;<a name="line.23"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Throwables;<a 
name="line.23"></a>
 <span class="sourceLineNo">024</span><a name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.io.IOException;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.io.InterruptedIOException;<a 
name="line.26"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
index a8fedcd..216bf8d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
@@ -23,7 +23,7 @@
 <span class="sourceLineNo">015</span> */<a name="line.15"></a>
 <span class="sourceLineNo">016</span>package org.apache.hadoop.hbase.client;<a 
name="line.16"></a>
 <span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.18"></a>
+<span class="sourceLineNo">018</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.18"></a>
 <span class="sourceLineNo">019</span>import org.apache.commons.logging.Log;<a 
name="line.19"></a>
 <span class="sourceLineNo">020</span>import 
org.apache.commons.logging.LogFactory;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.21"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
index a8fedcd..216bf8d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html
@@ -23,7 +23,7 @@
 <span class="sourceLineNo">015</span> */<a name="line.15"></a>
 <span class="sourceLineNo">016</span>package org.apache.hadoop.hbase.client;<a 
name="line.16"></a>
 <span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.18"></a>
+<span class="sourceLineNo">018</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.18"></a>
 <span class="sourceLineNo">019</span>import org.apache.commons.logging.Log;<a 
name="line.19"></a>
 <span class="sourceLineNo">020</span>import 
org.apache.commons.logging.LogFactory;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.21"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
index d9c9975..2242eba 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
@@ -25,7 +25,7 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.20"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.20"></a>
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span><a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.io.IOException;<a 
name="line.23"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
index d9c9975..2242eba 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.html
@@ -25,7 +25,7 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.20"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.20"></a>
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.calcEstimatedSize;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span><a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.io.IOException;<a 
name="line.23"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientScanner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientScanner.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientScanner.html
index 12b9fd5..90d39b8 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientScanner.html
@@ -29,7 +29,7 @@
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.createScanResultCache;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.incRegionCountMetrics;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.24"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.io.IOException;<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span>import java.io.InterruptedIOException;<a 
name="line.27"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
index ececdc0..41de383 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.ModifyableColumnFamilyDescriptor.html
@@ -25,7 +25,7 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
com.google.common.base.Preconditions;<a name="line.20"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.io.IOException;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.Collections;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.HashMap;<a 
name="line.23"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html
index ececdc0..41de383 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html
@@ -25,7 +25,7 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import 
com.google.common.base.Preconditions;<a name="line.20"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.io.IOException;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.Collections;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.HashMap;<a 
name="line.23"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionConfiguration.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionConfiguration.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionConfiguration.html
index 0f3a089..e6e74b1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionConfiguration.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionConfiguration.html
@@ -23,7 +23,7 @@
 <span class="sourceLineNo">015</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.15"></a>
 <span class="sourceLineNo">016</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.16"></a>
 <span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.18"></a>
+<span class="sourceLineNo">018</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>/**<a name="line.20"></a>
 <span class="sourceLineNo">021</span> * Configuration parameters for the 
connection.<a name="line.21"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceState.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceState.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceState.html
index 30052e2..6c200a1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceState.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceState.html
@@ -130,7 +130,7 @@
 <span class="sourceLineNo">122</span>import 
org.apache.hadoop.ipc.RemoteException;<a name="line.122"></a>
 <span class="sourceLineNo">123</span>import 
org.apache.zookeeper.KeeperException;<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
 <span class="sourceLineNo">127</span>import 
edu.umd.cs.findbugs.annotations.Nullable;<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceStubMaker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceStubMaker.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceStubMaker.html
index 30052e2..6c200a1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceStubMaker.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.MasterServiceStubMaker.html
@@ -130,7 +130,7 @@
 <span class="sourceLineNo">122</span>import 
org.apache.hadoop.ipc.RemoteException;<a name="line.122"></a>
 <span class="sourceLineNo">123</span>import 
org.apache.zookeeper.KeeperException;<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
 <span class="sourceLineNo">127</span>import 
edu.umd.cs.findbugs.annotations.Nullable;<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.ServerErrors.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.ServerErrors.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.ServerErrors.html
index 30052e2..6c200a1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.ServerErrors.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.ServerErrors.html
@@ -130,7 +130,7 @@
 <span class="sourceLineNo">122</span>import 
org.apache.hadoop.ipc.RemoteException;<a name="line.122"></a>
 <span class="sourceLineNo">123</span>import 
org.apache.zookeeper.KeeperException;<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
 <span class="sourceLineNo">127</span>import 
edu.umd.cs.findbugs.annotations.Nullable;<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.html
index 30052e2..6c200a1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.ServerErrorTracker.html
@@ -130,7 +130,7 @@
 <span class="sourceLineNo">122</span>import 
org.apache.hadoop.ipc.RemoteException;<a name="line.122"></a>
 <span class="sourceLineNo">123</span>import 
org.apache.zookeeper.KeeperException;<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
 <span class="sourceLineNo">127</span>import 
edu.umd.cs.findbugs.annotations.Nullable;<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.html
index 30052e2..6c200a1 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionImplementation.html
@@ -130,7 +130,7 @@
 <span class="sourceLineNo">122</span>import 
org.apache.hadoop.ipc.RemoteException;<a name="line.122"></a>
 <span class="sourceLineNo">123</span>import 
org.apache.zookeeper.KeeperException;<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.125"></a>
 <span class="sourceLineNo">126</span><a name="line.126"></a>
 <span class="sourceLineNo">127</span>import 
edu.umd.cs.findbugs.annotations.Nullable;<a name="line.127"></a>
 <span class="sourceLineNo">128</span><a name="line.128"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html
index b9ac9a6..f696563 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.MasterlessConnection.html
@@ -29,8 +29,8 @@
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.HConstants.EMPTY_END_ROW;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.HConstants.EMPTY_START_ROW;<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
com.google.common.base.Preconditions;<a name="line.25"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span><a name="line.26"></a>
 <span class="sourceLineNo">027</span>import java.io.IOException;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>import 
java.lang.reflect.UndeclaredThrowableException;<a name="line.28"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.html
index b9ac9a6..f696563 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/ConnectionUtils.html
@@ -29,8 +29,8 @@
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.HConstants.EMPTY_END_ROW;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.HConstants.EMPTY_START_ROW;<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
com.google.common.base.Preconditions;<a name="line.25"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span><a name="line.26"></a>
 <span class="sourceLineNo">027</span>import java.io.IOException;<a 
name="line.27"></a>
 <span class="sourceLineNo">028</span>import 
java.lang.reflect.UndeclaredThrowableException;<a name="line.28"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html
index 4bd98f4..046cb95 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.204"></a>
 <span class="sourceLineNo">205</span>import 
org.apache.zookeeper.KeeperException;<a name="line.205"></a>
 <span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.207"></a>
+<span class="sourceLineNo">207</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.207"></a>
 <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a 
name="line.208"></a>
 <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a 
name="line.209"></a>
 <span class="sourceLineNo">210</span>import 
com.google.protobuf.RpcController;<a name="line.210"></a>
@@ -1008,7 +1008,7 @@
 <span class="sourceLineNo">1000</span>  /**<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span>   * {@inheritDoc}<a 
name="line.1001"></a>
 <span class="sourceLineNo">1002</span>   * @deprecated Since 2.0. Will be 
removed in 3.0. Use<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a>
+<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1003"></a>
 <span class="sourceLineNo">1004</span>   */<a name="line.1004"></a>
 <span class="sourceLineNo">1005</span>  @Override<a name="line.1005"></a>
 <span class="sourceLineNo">1006</span>  @Deprecated<a name="line.1006"></a>
@@ -1018,14 +1018,14 @@
 <span class="sourceLineNo">1010</span>  }<a name="line.1010"></a>
 <span class="sourceLineNo">1011</span><a name="line.1011"></a>
 <span class="sourceLineNo">1012</span>  @Override<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final HColumnDescriptor columnFamily)<a 
name="line.1013"></a>
+<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final ColumnFamilyDescriptor columnFamily)<a 
name="line.1013"></a>
 <span class="sourceLineNo">1014</span>      throws IOException {<a 
name="line.1014"></a>
 <span class="sourceLineNo">1015</span>    get(addColumnFamilyAsync(tableName, 
columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a>
 <span class="sourceLineNo">1016</span>  }<a name="line.1016"></a>
 <span class="sourceLineNo">1017</span><a name="line.1017"></a>
 <span class="sourceLineNo">1018</span>  @Override<a name="line.1018"></a>
 <span class="sourceLineNo">1019</span>  public Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
+<span class="sourceLineNo">1020</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
 <span class="sourceLineNo">1021</span>    AddColumnResponse response =<a 
name="line.1021"></a>
 <span class="sourceLineNo">1022</span>        executeCallable(new 
MasterCallable&lt;AddColumnResponse&gt;(getConnection(),<a name="line.1022"></a>
 <span class="sourceLineNo">1023</span>            getRpcControllerFactory()) 
{<a name="line.1023"></a>
@@ -1106,7 +1106,7 @@
 <span class="sourceLineNo">1098</span>  /**<a name="line.1098"></a>
 <span class="sourceLineNo">1099</span>   * {@inheritDoc}<a 
name="line.1099"></a>
 <span class="sourceLineNo">1100</span>   * @deprecated As of 2.0. Will be 
removed in 3.0. Use<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a 
name="line.1101"></a>
+<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1101"></a>
 <span class="sourceLineNo">1102</span>   */<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  @Override<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span>  @Deprecated<a name="line.1104"></a>
@@ -1117,13 +1117,13 @@
 <span class="sourceLineNo">1109</span><a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  @Override<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span>  public void modifyColumnFamily(final 
TableName tableName,<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>    
get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, 
TimeUnit.MILLISECONDS);<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span><a name="line.1115"></a>
 <span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
 <span class="sourceLineNo">1117</span>  public Future&lt;Void&gt; 
modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
+<span class="sourceLineNo">1118</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
 <span class="sourceLineNo">1119</span>    ModifyColumnResponse response =<a 
name="line.1119"></a>
 <span class="sourceLineNo">1120</span>        executeCallable(new 
MasterCallable&lt;ModifyColumnResponse&gt;(getConnection(),<a 
name="line.1120"></a>
 <span class="sourceLineNo">1121</span>            getRpcControllerFactory()) 
{<a name="line.1121"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html
index 4bd98f4..046cb95 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.204"></a>
 <span class="sourceLineNo">205</span>import 
org.apache.zookeeper.KeeperException;<a name="line.205"></a>
 <span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.207"></a>
+<span class="sourceLineNo">207</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.207"></a>
 <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a 
name="line.208"></a>
 <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a 
name="line.209"></a>
 <span class="sourceLineNo">210</span>import 
com.google.protobuf.RpcController;<a name="line.210"></a>
@@ -1008,7 +1008,7 @@
 <span class="sourceLineNo">1000</span>  /**<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span>   * {@inheritDoc}<a 
name="line.1001"></a>
 <span class="sourceLineNo">1002</span>   * @deprecated Since 2.0. Will be 
removed in 3.0. Use<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a>
+<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1003"></a>
 <span class="sourceLineNo">1004</span>   */<a name="line.1004"></a>
 <span class="sourceLineNo">1005</span>  @Override<a name="line.1005"></a>
 <span class="sourceLineNo">1006</span>  @Deprecated<a name="line.1006"></a>
@@ -1018,14 +1018,14 @@
 <span class="sourceLineNo">1010</span>  }<a name="line.1010"></a>
 <span class="sourceLineNo">1011</span><a name="line.1011"></a>
 <span class="sourceLineNo">1012</span>  @Override<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final HColumnDescriptor columnFamily)<a 
name="line.1013"></a>
+<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final ColumnFamilyDescriptor columnFamily)<a 
name="line.1013"></a>
 <span class="sourceLineNo">1014</span>      throws IOException {<a 
name="line.1014"></a>
 <span class="sourceLineNo">1015</span>    get(addColumnFamilyAsync(tableName, 
columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a>
 <span class="sourceLineNo">1016</span>  }<a name="line.1016"></a>
 <span class="sourceLineNo">1017</span><a name="line.1017"></a>
 <span class="sourceLineNo">1018</span>  @Override<a name="line.1018"></a>
 <span class="sourceLineNo">1019</span>  public Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
+<span class="sourceLineNo">1020</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
 <span class="sourceLineNo">1021</span>    AddColumnResponse response =<a 
name="line.1021"></a>
 <span class="sourceLineNo">1022</span>        executeCallable(new 
MasterCallable&lt;AddColumnResponse&gt;(getConnection(),<a name="line.1022"></a>
 <span class="sourceLineNo">1023</span>            getRpcControllerFactory()) 
{<a name="line.1023"></a>
@@ -1106,7 +1106,7 @@
 <span class="sourceLineNo">1098</span>  /**<a name="line.1098"></a>
 <span class="sourceLineNo">1099</span>   * {@inheritDoc}<a 
name="line.1099"></a>
 <span class="sourceLineNo">1100</span>   * @deprecated As of 2.0. Will be 
removed in 3.0. Use<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a 
name="line.1101"></a>
+<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1101"></a>
 <span class="sourceLineNo">1102</span>   */<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  @Override<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span>  @Deprecated<a name="line.1104"></a>
@@ -1117,13 +1117,13 @@
 <span class="sourceLineNo">1109</span><a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  @Override<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span>  public void modifyColumnFamily(final 
TableName tableName,<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>    
get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, 
TimeUnit.MILLISECONDS);<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span><a name="line.1115"></a>
 <span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
 <span class="sourceLineNo">1117</span>  public Future&lt;Void&gt; 
modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
+<span class="sourceLineNo">1118</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
 <span class="sourceLineNo">1119</span>    ModifyColumnResponse response =<a 
name="line.1119"></a>
 <span class="sourceLineNo">1120</span>        executeCallable(new 
MasterCallable&lt;ModifyColumnResponse&gt;(getConnection(),<a 
name="line.1120"></a>
 <span class="sourceLineNo">1121</span>            getRpcControllerFactory()) 
{<a name="line.1121"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html
index 4bd98f4..046cb95 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.204"></a>
 <span class="sourceLineNo">205</span>import 
org.apache.zookeeper.KeeperException;<a name="line.205"></a>
 <span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.207"></a>
+<span class="sourceLineNo">207</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.207"></a>
 <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a 
name="line.208"></a>
 <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a 
name="line.209"></a>
 <span class="sourceLineNo">210</span>import 
com.google.protobuf.RpcController;<a name="line.210"></a>
@@ -1008,7 +1008,7 @@
 <span class="sourceLineNo">1000</span>  /**<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span>   * {@inheritDoc}<a 
name="line.1001"></a>
 <span class="sourceLineNo">1002</span>   * @deprecated Since 2.0. Will be 
removed in 3.0. Use<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a>
+<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1003"></a>
 <span class="sourceLineNo">1004</span>   */<a name="line.1004"></a>
 <span class="sourceLineNo">1005</span>  @Override<a name="line.1005"></a>
 <span class="sourceLineNo">1006</span>  @Deprecated<a name="line.1006"></a>
@@ -1018,14 +1018,14 @@
 <span class="sourceLineNo">1010</span>  }<a name="line.1010"></a>
 <span class="sourceLineNo">1011</span><a name="line.1011"></a>
 <span class="sourceLineNo">1012</span>  @Override<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final HColumnDescriptor columnFamily)<a 
name="line.1013"></a>
+<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final ColumnFamilyDescriptor columnFamily)<a 
name="line.1013"></a>
 <span class="sourceLineNo">1014</span>      throws IOException {<a 
name="line.1014"></a>
 <span class="sourceLineNo">1015</span>    get(addColumnFamilyAsync(tableName, 
columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a>
 <span class="sourceLineNo">1016</span>  }<a name="line.1016"></a>
 <span class="sourceLineNo">1017</span><a name="line.1017"></a>
 <span class="sourceLineNo">1018</span>  @Override<a name="line.1018"></a>
 <span class="sourceLineNo">1019</span>  public Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
+<span class="sourceLineNo">1020</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
 <span class="sourceLineNo">1021</span>    AddColumnResponse response =<a 
name="line.1021"></a>
 <span class="sourceLineNo">1022</span>        executeCallable(new 
MasterCallable&lt;AddColumnResponse&gt;(getConnection(),<a name="line.1022"></a>
 <span class="sourceLineNo">1023</span>            getRpcControllerFactory()) 
{<a name="line.1023"></a>
@@ -1106,7 +1106,7 @@
 <span class="sourceLineNo">1098</span>  /**<a name="line.1098"></a>
 <span class="sourceLineNo">1099</span>   * {@inheritDoc}<a 
name="line.1099"></a>
 <span class="sourceLineNo">1100</span>   * @deprecated As of 2.0. Will be 
removed in 3.0. Use<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a 
name="line.1101"></a>
+<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1101"></a>
 <span class="sourceLineNo">1102</span>   */<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  @Override<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span>  @Deprecated<a name="line.1104"></a>
@@ -1117,13 +1117,13 @@
 <span class="sourceLineNo">1109</span><a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  @Override<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span>  public void modifyColumnFamily(final 
TableName tableName,<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>    
get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, 
TimeUnit.MILLISECONDS);<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span><a name="line.1115"></a>
 <span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
 <span class="sourceLineNo">1117</span>  public Future&lt;Void&gt; 
modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
+<span class="sourceLineNo">1118</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
 <span class="sourceLineNo">1119</span>    ModifyColumnResponse response =<a 
name="line.1119"></a>
 <span class="sourceLineNo">1120</span>        executeCallable(new 
MasterCallable&lt;ModifyColumnResponse&gt;(getConnection(),<a 
name="line.1120"></a>
 <span class="sourceLineNo">1121</span>            getRpcControllerFactory()) 
{<a name="line.1121"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html
index 4bd98f4..046cb95 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.204"></a>
 <span class="sourceLineNo">205</span>import 
org.apache.zookeeper.KeeperException;<a name="line.205"></a>
 <span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.207"></a>
+<span class="sourceLineNo">207</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.207"></a>
 <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a 
name="line.208"></a>
 <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a 
name="line.209"></a>
 <span class="sourceLineNo">210</span>import 
com.google.protobuf.RpcController;<a name="line.210"></a>
@@ -1008,7 +1008,7 @@
 <span class="sourceLineNo">1000</span>  /**<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span>   * {@inheritDoc}<a 
name="line.1001"></a>
 <span class="sourceLineNo">1002</span>   * @deprecated Since 2.0. Will be 
removed in 3.0. Use<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a>
+<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1003"></a>
 <span class="sourceLineNo">1004</span>   */<a name="line.1004"></a>
 <span class="sourceLineNo">1005</span>  @Override<a name="line.1005"></a>
 <span class="sourceLineNo">1006</span>  @Deprecated<a name="line.1006"></a>
@@ -1018,14 +1018,14 @@
 <span class="sourceLineNo">1010</span>  }<a name="line.1010"></a>
 <span class="sourceLineNo">1011</span><a name="line.1011"></a>
 <span class="sourceLineNo">1012</span>  @Override<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final HColumnDescriptor columnFamily)<a 
name="line.1013"></a>
+<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final ColumnFamilyDescriptor columnFamily)<a 
name="line.1013"></a>
 <span class="sourceLineNo">1014</span>      throws IOException {<a 
name="line.1014"></a>
 <span class="sourceLineNo">1015</span>    get(addColumnFamilyAsync(tableName, 
columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a>
 <span class="sourceLineNo">1016</span>  }<a name="line.1016"></a>
 <span class="sourceLineNo">1017</span><a name="line.1017"></a>
 <span class="sourceLineNo">1018</span>  @Override<a name="line.1018"></a>
 <span class="sourceLineNo">1019</span>  public Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
+<span class="sourceLineNo">1020</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
 <span class="sourceLineNo">1021</span>    AddColumnResponse response =<a 
name="line.1021"></a>
 <span class="sourceLineNo">1022</span>        executeCallable(new 
MasterCallable&lt;AddColumnResponse&gt;(getConnection(),<a name="line.1022"></a>
 <span class="sourceLineNo">1023</span>            getRpcControllerFactory()) 
{<a name="line.1023"></a>
@@ -1106,7 +1106,7 @@
 <span class="sourceLineNo">1098</span>  /**<a name="line.1098"></a>
 <span class="sourceLineNo">1099</span>   * {@inheritDoc}<a 
name="line.1099"></a>
 <span class="sourceLineNo">1100</span>   * @deprecated As of 2.0. Will be 
removed in 3.0. Use<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a 
name="line.1101"></a>
+<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1101"></a>
 <span class="sourceLineNo">1102</span>   */<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  @Override<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span>  @Deprecated<a name="line.1104"></a>
@@ -1117,13 +1117,13 @@
 <span class="sourceLineNo">1109</span><a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  @Override<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span>  public void modifyColumnFamily(final 
TableName tableName,<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>    
get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, 
TimeUnit.MILLISECONDS);<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span><a name="line.1115"></a>
 <span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
 <span class="sourceLineNo">1117</span>  public Future&lt;Void&gt; 
modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
+<span class="sourceLineNo">1118</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
 <span class="sourceLineNo">1119</span>    ModifyColumnResponse response =<a 
name="line.1119"></a>
 <span class="sourceLineNo">1120</span>        executeCallable(new 
MasterCallable&lt;ModifyColumnResponse&gt;(getConnection(),<a 
name="line.1120"></a>
 <span class="sourceLineNo">1121</span>            getRpcControllerFactory()) 
{<a name="line.1121"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html
index 4bd98f4..046cb95 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html
@@ -212,7 +212,7 @@
 <span class="sourceLineNo">204</span>import 
org.apache.hadoop.util.StringUtils;<a name="line.204"></a>
 <span class="sourceLineNo">205</span>import 
org.apache.zookeeper.KeeperException;<a name="line.205"></a>
 <span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.207"></a>
+<span class="sourceLineNo">207</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.207"></a>
 <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a 
name="line.208"></a>
 <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a 
name="line.209"></a>
 <span class="sourceLineNo">210</span>import 
com.google.protobuf.RpcController;<a name="line.210"></a>
@@ -1008,7 +1008,7 @@
 <span class="sourceLineNo">1000</span>  /**<a name="line.1000"></a>
 <span class="sourceLineNo">1001</span>   * {@inheritDoc}<a 
name="line.1001"></a>
 <span class="sourceLineNo">1002</span>   * @deprecated Since 2.0. Will be 
removed in 3.0. Use<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a>
+<span class="sourceLineNo">1003</span>   *     {@link 
#addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1003"></a>
 <span class="sourceLineNo">1004</span>   */<a name="line.1004"></a>
 <span class="sourceLineNo">1005</span>  @Override<a name="line.1005"></a>
 <span class="sourceLineNo">1006</span>  @Deprecated<a name="line.1006"></a>
@@ -1018,14 +1018,14 @@
 <span class="sourceLineNo">1010</span>  }<a name="line.1010"></a>
 <span class="sourceLineNo">1011</span><a name="line.1011"></a>
 <span class="sourceLineNo">1012</span>  @Override<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final HColumnDescriptor columnFamily)<a 
name="line.1013"></a>
+<span class="sourceLineNo">1013</span>  public void addColumnFamily(final 
TableName tableName, final ColumnFamilyDescriptor columnFamily)<a 
name="line.1013"></a>
 <span class="sourceLineNo">1014</span>      throws IOException {<a 
name="line.1014"></a>
 <span class="sourceLineNo">1015</span>    get(addColumnFamilyAsync(tableName, 
columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a>
 <span class="sourceLineNo">1016</span>  }<a name="line.1016"></a>
 <span class="sourceLineNo">1017</span><a name="line.1017"></a>
 <span class="sourceLineNo">1018</span>  @Override<a name="line.1018"></a>
 <span class="sourceLineNo">1019</span>  public Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
+<span class="sourceLineNo">1020</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1020"></a>
 <span class="sourceLineNo">1021</span>    AddColumnResponse response =<a 
name="line.1021"></a>
 <span class="sourceLineNo">1022</span>        executeCallable(new 
MasterCallable&lt;AddColumnResponse&gt;(getConnection(),<a name="line.1022"></a>
 <span class="sourceLineNo">1023</span>            getRpcControllerFactory()) 
{<a name="line.1023"></a>
@@ -1106,7 +1106,7 @@
 <span class="sourceLineNo">1098</span>  /**<a name="line.1098"></a>
 <span class="sourceLineNo">1099</span>   * {@inheritDoc}<a 
name="line.1099"></a>
 <span class="sourceLineNo">1100</span>   * @deprecated As of 2.0. Will be 
removed in 3.0. Use<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a 
name="line.1101"></a>
+<span class="sourceLineNo">1101</span>   *     {@link 
#modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a 
name="line.1101"></a>
 <span class="sourceLineNo">1102</span>   */<a name="line.1102"></a>
 <span class="sourceLineNo">1103</span>  @Override<a name="line.1103"></a>
 <span class="sourceLineNo">1104</span>  @Deprecated<a name="line.1104"></a>
@@ -1117,13 +1117,13 @@
 <span class="sourceLineNo">1109</span><a name="line.1109"></a>
 <span class="sourceLineNo">1110</span>  @Override<a name="line.1110"></a>
 <span class="sourceLineNo">1111</span>  public void modifyColumnFamily(final 
TableName tableName,<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
+<span class="sourceLineNo">1112</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1112"></a>
 <span class="sourceLineNo">1113</span>    
get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, 
TimeUnit.MILLISECONDS);<a name="line.1113"></a>
 <span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
 <span class="sourceLineNo">1115</span><a name="line.1115"></a>
 <span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
 <span class="sourceLineNo">1117</span>  public Future&lt;Void&gt; 
modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>      final HColumnDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
+<span class="sourceLineNo">1118</span>      final ColumnFamilyDescriptor 
columnFamily) throws IOException {<a name="line.1118"></a>
 <span class="sourceLineNo">1119</span>    ModifyColumnResponse response =<a 
name="line.1119"></a>
 <span class="sourceLineNo">1120</span>        executeCallable(new 
MasterCallable&lt;ModifyColumnResponse&gt;(getConnection(),<a 
name="line.1120"></a>
 <span class="sourceLineNo">1121</span>            getRpcControllerFactory()) 
{<a name="line.1121"></a>

Reply via email to