http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
index bcb9b8e..310709a 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileStatusConverter.html
@@ -50,10 +50,10 @@
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.io.MultipleIOException;<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>import com.google.common.base.Function;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.base.Preconditions;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.common.collect.Collections2;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import com.google.common.collect.Lists;<a 
name="line.48"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Function;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Collections2;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * Utility class to handle the removal of 
HFiles (or the respective {@link StoreFile StoreFiles})<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
index bcb9b8e..310709a 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileablePath.html
@@ -50,10 +50,10 @@
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.io.MultipleIOException;<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>import com.google.common.base.Function;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.base.Preconditions;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.common.collect.Collections2;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import com.google.common.collect.Lists;<a 
name="line.48"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Function;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Collections2;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * Utility class to handle the removal of 
HFiles (or the respective {@link StoreFile StoreFiles})<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
index bcb9b8e..310709a 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.FileableStoreFile.html
@@ -50,10 +50,10 @@
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.io.MultipleIOException;<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>import com.google.common.base.Function;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.base.Preconditions;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.common.collect.Collections2;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import com.google.common.collect.Lists;<a 
name="line.48"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Function;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Collections2;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * Utility class to handle the removal of 
HFiles (or the respective {@link StoreFile StoreFiles})<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
index bcb9b8e..310709a 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.StoreToFile.html
@@ -50,10 +50,10 @@
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.io.MultipleIOException;<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>import com.google.common.base.Function;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.base.Preconditions;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.common.collect.Collections2;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import com.google.common.collect.Lists;<a 
name="line.48"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Function;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Collections2;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * Utility class to handle the removal of 
HFiles (or the respective {@link StoreFile StoreFiles})<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
index bcb9b8e..310709a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/HFileArchiver.html
@@ -50,10 +50,10 @@
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.io.MultipleIOException;<a name="line.43"></a>
 <span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>import com.google.common.base.Function;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.base.Preconditions;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.common.collect.Collections2;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import com.google.common.collect.Lists;<a 
name="line.48"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Function;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Collections2;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * Utility class to handle the removal of 
HFiles (or the respective {@link StoreFile StoreFiles})<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
index 503ce7b..7053dbf 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
@@ -56,7 +56,7 @@
 <span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.49"></a>
 <span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>import com.google.common.collect.Lists;<a 
name="line.51"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.51"></a>
 <span class="sourceLineNo">052</span><a name="line.52"></a>
 <span class="sourceLineNo">053</span>@InterfaceAudience.Private<a 
name="line.53"></a>
 <span class="sourceLineNo">054</span>public class BackupAdminImpl implements 
BackupAdmin {<a name="line.54"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.BackupSetCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CancelCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CancelCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CancelCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CancelCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CancelCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.Command.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.Command.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.Command.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.Command.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.Command.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CreateCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CreateCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CreateCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CreateCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.CreateCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DeleteCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DeleteCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DeleteCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DeleteCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DeleteCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DescribeCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DescribeCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DescribeCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DescribeCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.DescribeCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HelpCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HelpCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HelpCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HelpCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HelpCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HistoryCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HistoryCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HistoryCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HistoryCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.HistoryCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.ProgressCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.RepairCommand.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.RepairCommand.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.RepairCommand.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.RepairCommand.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.RepairCommand.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.html
index 0fe0c54..5b08d6e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupCommands.html
@@ -69,7 +69,7 @@
 <span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.61"></a>
 <span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>import com.google.common.collect.Lists;<a 
name="line.64"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
 <span class="sourceLineNo">066</span>/**<a name="line.66"></a>
 <span class="sourceLineNo">067</span> * General backup commands, options and 
usage messages<a name="line.67"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupManager.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupManager.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupManager.html
index 4cd76fe..cf91b46 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupManager.html
@@ -57,7 +57,7 @@
 <span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.procedure.ProcedureManagerHost;<a name="line.49"></a>
 <span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.50"></a>
 <span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>/**<a name="line.54"></a>
 <span class="sourceLineNo">055</span> * Handles backup requests, creates 
backup info records in backup system table to<a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.Stage.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.Stage.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.Stage.html
index 345e4d3..c5ade7d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.Stage.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.Stage.html
@@ -51,7 +51,7 @@
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.44"></a>
 <span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.46"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.46"></a>
 <span class="sourceLineNo">047</span><a name="line.47"></a>
 <span class="sourceLineNo">048</span>/**<a name="line.48"></a>
 <span class="sourceLineNo">049</span> * Base class for backup operation. 
Concrete implementation for<a name="line.49"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.html
index 345e4d3..c5ade7d 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/TableBackupClient.html
@@ -51,7 +51,7 @@
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.44"></a>
 <span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
com.google.common.annotations.VisibleForTesting;<a name="line.46"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.46"></a>
 <span class="sourceLineNo">047</span><a name="line.47"></a>
 <span class="sourceLineNo">048</span>/**<a name="line.48"></a>
 <span class="sourceLineNo">049</span> * Base class for backup operation. 
Concrete implementation for<a name="line.49"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.HFileCellMapper.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.HFileCellMapper.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.HFileCellMapper.html
index 5a8b269..be751b5 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.HFileCellMapper.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.HFileCellMapper.html
@@ -139,7 +139,7 @@
 <span class="sourceLineNo">131</span>      LOG.debug("success configuring load 
incremental job");<a name="line.131"></a>
 <span class="sourceLineNo">132</span><a name="line.132"></a>
 <span class="sourceLineNo">133</span>      
TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>        
com.google.common.base.Preconditions.class);<a name="line.134"></a>
+<span class="sourceLineNo">134</span>        
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.class);<a 
name="line.134"></a>
 <span class="sourceLineNo">135</span>    } else {<a name="line.135"></a>
 <span class="sourceLineNo">136</span>      throw new IOException("No bulk 
output directory specified");<a name="line.136"></a>
 <span class="sourceLineNo">137</span>    }<a name="line.137"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.html
index 5a8b269..be751b5 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/HFileSplitterJob.html
@@ -139,7 +139,7 @@
 <span class="sourceLineNo">131</span>      LOG.debug("success configuring load 
incremental job");<a name="line.131"></a>
 <span class="sourceLineNo">132</span><a name="line.132"></a>
 <span class="sourceLineNo">133</span>      
TableMapReduceUtil.addDependencyJars(job.getConfiguration(),<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>        
com.google.common.base.Preconditions.class);<a name="line.134"></a>
+<span class="sourceLineNo">134</span>        
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions.class);<a 
name="line.134"></a>
 <span class="sourceLineNo">135</span>    } else {<a name="line.135"></a>
 <span class="sourceLineNo">136</span>      throw new IOException("No bulk 
output directory specified");<a name="line.136"></a>
 <span class="sourceLineNo">137</span>    }<a name="line.137"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
index def5ec9..9905574 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
@@ -722,7 +722,7 @@
 <span class="sourceLineNo">714</span>   * @deprecated As of release 2.0.0.<a 
name="line.714"></a>
 <span class="sourceLineNo">715</span>   *             (&lt;a 
href="https://issues.apache.org/jira/browse/HBASE-1989"&gt;HBASE-1989&lt;/a&gt;).<a
 name="line.715"></a>
 <span class="sourceLineNo">716</span>   *             This will be removed in 
HBase 3.0.0.<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   *             Use {@link 
#addColumnFamily(TableName, HColumnDescriptor)}.<a name="line.717"></a>
+<span class="sourceLineNo">717</span>   *             Use {@link 
#addColumnFamily(TableName, ColumnFamilyDescriptor)}.<a name="line.717"></a>
 <span class="sourceLineNo">718</span>   */<a name="line.718"></a>
 <span class="sourceLineNo">719</span>  @Deprecated<a name="line.719"></a>
 <span class="sourceLineNo">720</span>  void addColumn(final TableName 
tableName, final HColumnDescriptor columnFamily)<a name="line.720"></a>
@@ -735,7 +735,7 @@
 <span class="sourceLineNo">727</span>   * @param columnFamily column family 
descriptor of column family to be added<a name="line.727"></a>
 <span class="sourceLineNo">728</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.728"></a>
 <span class="sourceLineNo">729</span>   */<a name="line.729"></a>
-<span class="sourceLineNo">730</span>  void addColumnFamily(final TableName 
tableName, final HColumnDescriptor columnFamily)<a name="line.730"></a>
+<span class="sourceLineNo">730</span>  void addColumnFamily(final TableName 
tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.730"></a>
 <span class="sourceLineNo">731</span>    throws IOException;<a 
name="line.731"></a>
 <span class="sourceLineNo">732</span><a name="line.732"></a>
 <span class="sourceLineNo">733</span>  /**<a name="line.733"></a>
@@ -751,7 +751,7 @@
 <span class="sourceLineNo">743</span>   * @return the result of the async add 
column family. You can use Future.get(long, TimeUnit) to<a name="line.743"></a>
 <span class="sourceLineNo">744</span>   *         wait on the operation to 
complete.<a name="line.744"></a>
 <span class="sourceLineNo">745</span>   */<a name="line.745"></a>
-<span class="sourceLineNo">746</span>  Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName, final HColumnDescriptor 
columnFamily)<a name="line.746"></a>
+<span class="sourceLineNo">746</span>  Future&lt;Void&gt; 
addColumnFamilyAsync(final TableName tableName, final ColumnFamilyDescriptor 
columnFamily)<a name="line.746"></a>
 <span class="sourceLineNo">747</span>      throws IOException;<a 
name="line.747"></a>
 <span class="sourceLineNo">748</span><a name="line.748"></a>
 <span class="sourceLineNo">749</span>  /**<a name="line.749"></a>
@@ -802,7 +802,7 @@
 <span class="sourceLineNo">794</span>   * @deprecated As of release 2.0.0.<a 
name="line.794"></a>
 <span class="sourceLineNo">795</span>   *             (&lt;a 
href="https://issues.apache.org/jira/browse/HBASE-1989"&gt;HBASE-1989&lt;/a&gt;).<a
 name="line.795"></a>
 <span class="sourceLineNo">796</span>   *             This will be removed in 
HBase 3.0.0.<a name="line.796"></a>
-<span class="sourceLineNo">797</span>   *             Use {@link 
#modifyColumnFamily(TableName, HColumnDescriptor)}.<a name="line.797"></a>
+<span class="sourceLineNo">797</span>   *             Use {@link 
#modifyColumnFamily(TableName, ColumnFamilyDescriptor)}.<a name="line.797"></a>
 <span class="sourceLineNo">798</span>   */<a name="line.798"></a>
 <span class="sourceLineNo">799</span>  @Deprecated<a name="line.799"></a>
 <span class="sourceLineNo">800</span>  void modifyColumn(final TableName 
tableName, final HColumnDescriptor columnFamily)<a name="line.800"></a>
@@ -815,7 +815,7 @@
 <span class="sourceLineNo">807</span>   * @param columnFamily new column 
family descriptor to use<a name="line.807"></a>
 <span class="sourceLineNo">808</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.808"></a>
 <span class="sourceLineNo">809</span>   */<a name="line.809"></a>
-<span class="sourceLineNo">810</span>  void modifyColumnFamily(final TableName 
tableName, final HColumnDescriptor columnFamily)<a name="line.810"></a>
+<span class="sourceLineNo">810</span>  void modifyColumnFamily(final TableName 
tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.810"></a>
 <span class="sourceLineNo">811</span>      throws IOException;<a 
name="line.811"></a>
 <span class="sourceLineNo">812</span><a name="line.812"></a>
 <span class="sourceLineNo">813</span>  /**<a name="line.813"></a>
@@ -831,7 +831,7 @@
 <span class="sourceLineNo">823</span>   * @return the result of the async 
modify column family. You can use Future.get(long, TimeUnit) to<a 
name="line.823"></a>
 <span class="sourceLineNo">824</span>   *         wait on the operation to 
complete.<a name="line.824"></a>
 <span class="sourceLineNo">825</span>   */<a name="line.825"></a>
-<span class="sourceLineNo">826</span>  Future&lt;Void&gt; 
modifyColumnFamilyAsync(TableName tableName, HColumnDescriptor columnFamily)<a 
name="line.826"></a>
+<span class="sourceLineNo">826</span>  Future&lt;Void&gt; 
modifyColumnFamilyAsync(TableName tableName, ColumnFamilyDescriptor 
columnFamily)<a name="line.826"></a>
 <span class="sourceLineNo">827</span>      throws IOException;<a 
name="line.827"></a>
 <span class="sourceLineNo">828</span><a name="line.828"></a>
 <span class="sourceLineNo">829</span><a name="line.829"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncConnectionImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncConnectionImpl.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncConnectionImpl.html
index 3150437..1f7cd8c 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncConnectionImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncConnectionImpl.html
@@ -29,7 +29,7 @@
 <span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.client.ConnectionUtils.getStubKey;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.apache.hadoop.hbase.client.NonceGenerator.CLIENT_NONCES_ENABLED_KEY;<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 io.netty.util.HashedWheelTimer;<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span><a name="line.27"></a>

Reply via email to