[35/52] [partial] hbase-site git commit: Published site at b6ba13c37715422710a142f6f82ba4817129c3d6.

2016-09-06 Thread misty 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1d6655bb/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
index 55c4941..05d1e35 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -324,16 +324,16 @@
 ActiveMasterManager.master
 
 
-private Server
-CatalogJanitor.server
+protected Server
+BulkAssigner.server
 
 
 private Server
-SplitLogManager.server
+CatalogJanitor.server
 
 
-protected Server
-BulkAssigner.server
+private Server
+SplitLogManager.server
 
 
 
@@ -431,19 +431,19 @@
 
 
 private Server
-HeapMemoryManager.server
+SplitTransactionImpl.server
 
 
 private Server
-SplitTransactionImpl.server
+SplitTransactionImpl.DaughterOpener.server
 
 
 private Server
-SplitTransactionImpl.DaughterOpener.server
+LogRoller.server
 
 
 private Server
-LogRoller.server
+HeapMemoryManager.server
 
 
 
@@ -456,21 +456,21 @@
 
 
 Server
-RegionMergeTransactionImpl.getServer()
+RegionMergeTransaction.getServer()
+Get the Server running the transaction or rollback
+
 
 
 Server
-SplitTransactionImpl.getServer()
+RegionMergeTransactionImpl.getServer()
 
 
 Server
-SplitTransaction.getServer()
-Get the Server running the transaction or rollback
-
+SplitTransactionImpl.getServer()
 
 
 Server
-RegionMergeTransaction.getServer()
+SplitTransaction.getServer()
 Get the Server running the transaction or rollback
 
 
@@ -508,15 +508,24 @@
 
 
 Region
+RegionMergeTransaction.execute(Serverserver,
+  RegionServerServicesservices)
+Deprecated.
+use #execute(Server, RegionServerServices, 
User)
+
+
+
+
+Region
 RegionMergeTransactionImpl.execute(Serverserver,
   RegionServerServicesservices)
 
-
+
 PairOfSameTypeRegion
 SplitTransactionImpl.execute(Serverserver,
   RegionServerServicesservices)
 
-
+
 PairOfSameTypeRegion
 SplitTransaction.execute(Serverserver,
   RegionServerServicesservices)
@@ -525,28 +534,27 @@
 
 
 
-
+
 Region
-RegionMergeTransaction.execute(Serverserver,
-  RegionServerServicesservices)
-Deprecated.
-use #execute(Server, RegionServerServices, 
User)
-
+RegionMergeTransaction.execute(Serverserver,
+  RegionServerServicesservices,
+  Useruser)
+Run the transaction.
 
 
-
+
 Region
 RegionMergeTransactionImpl.execute(Serverserver,
   RegionServerServicesservices,
   Useruser)
 
-
+
 PairOfSameTypeRegion
 SplitTransactionImpl.execute(Serverserver,
   RegionServerServicesservices,
   Useruser)
 
-
+
 PairOfSameTypeRegion
 SplitTransaction.execute(Serverserver,
   RegionServerServicesservices,
@@ -554,14 +562,6 @@
 Run the transaction.
 
 
-
-Region
-RegionMergeTransaction.execute(Serverserver,
-  RegionServerServicesservices,
-  Useruser)
-Run the transaction.
-
-
 
 void
 ReplicationService.initialize(Serverrs,
@@ -597,55 +597,55 @@
 
 
 boolean
-RegionMergeTransactionImpl.rollback(Serverserver,
-RegionServerServicesservices)
+RegionMergeTransaction.rollback(Serverserver,
+RegionServerServicesservices)
+Deprecated.
+use #rollback(Server, RegionServerServices, 
User)
+
+
 
 
 boolean
-SplitTransactionImpl.rollback(Serverserver,
+RegionMergeTransactionImpl.rollback(Serverserver,
 RegionServerServicesservices)
 
 
 boolean
-SplitTransaction.rollback(Serverserver,
-RegionServerServicesservices)
-Deprecated.
-use #rollback(Server, RegionServerServices, User); as of 
1.0.2, remove in 3.0
-
-
+SplitTransactionImpl.rollback(Serverserver,
+RegionServerServicesservices)
 
 
 boolean
-RegionMergeTransaction.rollback(Serverserver,
+SplitTransaction.rollback(Serverserver,
 RegionServerServicesservices)
 Deprecated.
-use #rollback(Server, RegionServerServices, 
User)
+use #rollback(Server, RegionServerServices, User); as of 
1.0.2, remove in 3.0
 
 
 
 
 boolean
-RegionMergeTransactionImpl.rollback(Serverserver,
+RegionMergeTransaction.rollback(Serverserver,
 RegionServerServicesservices,
-Useruser)
+Useruser)
+Roll back a failed transaction
+
 
 
 boolean
-SplitTransactionImpl.rollback(Serverserver,
+RegionMergeTransactionImpl.rollback(Serverserver,
 RegionServerServicesservices,
 Useruser)
 
 
 boolean
-SplitTransaction.rollback(Serverserver,
+SplitTransactionImpl.rollback(Serverserver,
 RegionServerServicesservices,
-Useruser)
-Roll back a failed transaction
-
+Useruser)
 
 
 boolean
-RegionMergeTransaction.rollback(Serverserver,
+SplitTransaction.rollback(Serverserver,
 RegionServerServicesservices,

[35/52] [partial] hbase-site git commit: Published site at b6ba13c37715422710a142f6f82ba4817129c3d6.

2016-09-05 Thread dimaspivak 
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fea47de/devapidocs/org/apache/hadoop/hbase/class-use/HRegionLocation.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/HRegionLocation.html 
b/devapidocs/org/apache/hadoop/hbase/class-use/HRegionLocation.html
index 6a78e5d..6abcf30 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/HRegionLocation.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/HRegionLocation.html
@@ -266,11 +266,11 @@ service.
 
 
 protected HRegionLocation
-RegionAdminServiceCallable.location
+AbstractRegionServerCallable.location
 
 
 protected HRegionLocation
-AbstractRegionServerCallable.location
+RegionAdminServiceCallable.location
 
 
 
@@ -298,11 +298,11 @@ service.
 
 
 protected HRegionLocation
-MultiServerCallable.getLocation()
+AbstractRegionServerCallable.getLocation()
 
 
 protected HRegionLocation
-AbstractRegionServerCallable.getLocation()
+MultiServerCallable.getLocation()
 
 
 HRegionLocation
@@ -468,16 +468,16 @@ service.
 
 
 
-private void
-ConnectionImplementation.cacheLocation(TableNametableName,
+void
+MetaCache.cacheLocation(TableNametableName,
   ServerNamesource,
   HRegionLocationlocation)
 Put a newly discovered HRegionLocation into the cache.
 
 
 
-void
-MetaCache.cacheLocation(TableNametableName,
+private void
+ConnectionImplementation.cacheLocation(TableNametableName,
   ServerNamesource,
   HRegionLocationlocation)
 Put a newly discovered HRegionLocation into the cache.