http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fea47de/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 05d1e35..55c4941 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html
@@ -324,17 +324,17 @@
ActiveMasterManager.master
-protected Server
-BulkAssigner.server
-
-
private Server
CatalogJanitor.server
-
+
private Server
SplitLogManager.server
+
+protected Server
+BulkAssigner.server
+
@@ -431,19 +431,19 @@
private Server
-SplitTransactionImpl.server
+HeapMemoryManager.server
private Server
-SplitTransactionImpl.DaughterOpener.server
+SplitTransactionImpl.server
private Server
-LogRoller.server
+SplitTransactionImpl.DaughterOpener.server
private Server
-HeapMemoryManager.server
+LogRoller.server
@@ -456,21 +456,21 @@
Server
-RegionMergeTransaction.getServer()
-Get the Server running the transaction or rollback
-
+RegionMergeTransactionImpl.getServer()
Server
-RegionMergeTransactionImpl.getServer()
+SplitTransactionImpl.getServer()
Server
-SplitTransactionImpl.getServer()
+SplitTransaction.getServer()
+Get the Server running the transaction or rollback
+
Server
-SplitTransaction.getServer()
+RegionMergeTransaction.getServer()
Get the Server running the transaction or rollback
@@ -508,24 +508,15 @@
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)
@@ -534,27 +525,28 @@
-
+
Region
-RegionMergeTransaction.execute(Serverserver,
- RegionServerServicesservices,
- Useruser)
-Run the transaction.
+RegionMergeTransaction.execute(Serverserver,
+ RegionServerServicesservices)
+Deprecated.
+use #execute(Server, RegionServerServices,
User)
+
-
+
Region
RegionMergeTransactionImpl.execute(Serverserver,
RegionServerServicesservices,
Useruser)
-
+
PairOfSameTypeRegion
SplitTransactionImpl.execute(Serverserver,
RegionServerServicesservices,
Useruser)
-
+
PairOfSameTypeRegion
SplitTransaction.execute(Serverserver,
RegionServerServicesservices,
@@ -562,6 +554,14 @@
Run the transaction.
+
+Region
+RegionMergeTransaction.execute(Serverserver,
+ RegionServerServicesservices,
+ Useruser)
+Run the transaction.
+
+
void
ReplicationService.initialize(Serverrs,
@@ -597,24 +597,15 @@
boolean
-RegionMergeTransaction.rollback(Serverserver,
-RegionServerServicesservices)
-Deprecated.
-use #rollback(Server, RegionServerServices,
User)
-
-
-
-
-boolean
RegionMergeTransactionImpl.rollback(Serverserver,
RegionServerServicesservices)
-
+
boolean
SplitTransactionImpl.rollback(Serverserver,
RegionServerServicesservices)
-
+
boolean
SplitTransaction.rollback(Serverserver,
RegionServerServicesservices)
@@ -623,27 +614,28 @@
-
+
boolean
-RegionMergeTransaction.rollback(Serverserver,
-RegionServerServicesservices,
-Useruser)
-Roll back a failed transaction
+RegionMergeTransaction.rollback(Serverserver,
+RegionServerServicesservices)
+Deprecated.
+use #rollback(Server, RegionServerServices,
User)
+
-
+
boolean
RegionMergeTransactionImpl.rollback(Serverserver,
RegionServerServicesservices,
Useruser)
-
+
boolean
SplitTransactionImpl.rollback(Serverserver,
RegionServerServicesservices,
Useruser)
-
+
boolean
SplitTransaction.rollback(Serverserver,
RegionServerServicesservices,
@@ -651,6 +643,14 @@
Roll back a failed transaction
+
+boolean
+RegionMergeTransaction.rollback(Serverserver,
+RegionServerServicesservices,
+Useruser)
+Roll back a failed transaction
+
+
void
RegionMergeTransactionImpl.stepsAfterPONR(Serverserver,
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6fea47de/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
b/devapidocs/org/apache/hadoop/hbase/class-use/ServerName.html
index 83e62d0..41c3e74 100644
---