You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/02/11 15:14:22 UTC
[06/20] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.html
index 868136c..525102f 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.html
@@ -132,7 +132,7 @@
<span class="sourceLineNo">124</span> table.addFamily(fam);<a name="line.124"></a>
<span class="sourceLineNo">125</span> }<a name="line.125"></a>
<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> @Test(timeout=300000)<a name="line.127"></a>
+<span class="sourceLineNo">127</span> @Test<a name="line.127"></a>
<span class="sourceLineNo">128</span> public void testMultiSlaveReplication() throws Exception {<a name="line.128"></a>
<span class="sourceLineNo">129</span> LOG.info("testCyclicReplication");<a name="line.129"></a>
<span class="sourceLineNo">130</span> MiniHBaseCluster master = utility1.startMiniCluster();<a name="line.130"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html
index dfe9a51..cf3a165 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html
@@ -379,7 +379,7 @@
<span class="sourceLineNo">371</span> assertTrue(tabCFsMap.get(tableName3).contains("cf3"));<a name="line.371"></a>
<span class="sourceLineNo">372</span> }<a name="line.372"></a>
<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> @Test(timeout=300000)<a name="line.374"></a>
+<span class="sourceLineNo">374</span> @Test<a name="line.374"></a>
<span class="sourceLineNo">375</span> public void testPerTableCFReplication() throws Exception {<a name="line.375"></a>
<span class="sourceLineNo">376</span> LOG.info("testPerTableCFReplication");<a name="line.376"></a>
<span class="sourceLineNo">377</span> ReplicationAdmin replicationAdmin = new ReplicationAdmin(conf1);<a name="line.377"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.html
index 4f563c0..06c8213 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.html
@@ -100,7 +100,7 @@
<span class="sourceLineNo">092</span> }<a name="line.92"></a>
<span class="sourceLineNo">093</span> }<a name="line.93"></a>
<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> @Test(timeout = 300000)<a name="line.95"></a>
+<span class="sourceLineNo">095</span> @Test<a name="line.95"></a>
<span class="sourceLineNo">096</span> public void testChangingNumberOfPeerRegionServers() throws IOException, InterruptedException {<a name="line.96"></a>
<span class="sourceLineNo">097</span><a name="line.97"></a>
<span class="sourceLineNo">098</span> LOG.info("testSimplePutDelete");<a name="line.98"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.html
index 3308879..de22728 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.html
@@ -59,7 +59,7 @@
<span class="sourceLineNo">051</span> *<a name="line.51"></a>
<span class="sourceLineNo">052</span> * @throws Exception<a name="line.52"></a>
<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span> @Test(timeout = 600000)<a name="line.54"></a>
+<span class="sourceLineNo">054</span> @Test<a name="line.54"></a>
<span class="sourceLineNo">055</span> public void testDisableInactivePeer() throws Exception {<a name="line.55"></a>
<span class="sourceLineNo">056</span> utility2.shutdownMiniHBaseCluster();<a name="line.56"></a>
<span class="sourceLineNo">057</span><a name="line.57"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html
index d32c021..fd7ec6d 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html
@@ -104,7 +104,7 @@
<span class="sourceLineNo">096</span> }<a name="line.96"></a>
<span class="sourceLineNo">097</span> }<a name="line.97"></a>
<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Test(timeout = 600000)<a name="line.99"></a>
+<span class="sourceLineNo">099</span> @Test<a name="line.99"></a>
<span class="sourceLineNo">100</span> public void testEditsStuckBehindDroppedTable() throws Exception {<a name="line.100"></a>
<span class="sourceLineNo">101</span> // Sanity check<a name="line.101"></a>
<span class="sourceLineNo">102</span> // Make sure by default edits for dropped tables stall the replication queue, even when the<a name="line.102"></a>
@@ -112,14 +112,14 @@
<span class="sourceLineNo">104</span> testEditsBehindDroppedTable(false, "test_dropped");<a name="line.104"></a>
<span class="sourceLineNo">105</span> }<a name="line.105"></a>
<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> @Test(timeout = 600000)<a name="line.107"></a>
+<span class="sourceLineNo">107</span> @Test<a name="line.107"></a>
<span class="sourceLineNo">108</span> public void testEditsDroppedWithDroppedTable() throws Exception {<a name="line.108"></a>
<span class="sourceLineNo">109</span> // Make sure by default edits for dropped tables are themselves dropped when the<a name="line.109"></a>
<span class="sourceLineNo">110</span> // table(s) in question have been deleted on both ends.<a name="line.110"></a>
<span class="sourceLineNo">111</span> testEditsBehindDroppedTable(true, "test_dropped");<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Test(timeout = 600000)<a name="line.114"></a>
+<span class="sourceLineNo">114</span> @Test<a name="line.114"></a>
<span class="sourceLineNo">115</span> public void testEditsDroppedWithDroppedTableNS() throws Exception {<a name="line.115"></a>
<span class="sourceLineNo">116</span> // also try with a namespace<a name="line.116"></a>
<span class="sourceLineNo">117</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.117"></a>
@@ -200,7 +200,7 @@
<span class="sourceLineNo">192</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, false);<a name="line.192"></a>
<span class="sourceLineNo">193</span> }<a name="line.193"></a>
<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> @Test(timeout = 600000)<a name="line.195"></a>
+<span class="sourceLineNo">195</span> @Test<a name="line.195"></a>
<span class="sourceLineNo">196</span> public void testEditsBehindDroppedTableTiming() throws Exception {<a name="line.196"></a>
<span class="sourceLineNo">197</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, true);<a name="line.197"></a>
<span class="sourceLineNo">198</span> conf1.setInt(HConstants.REPLICATION_SOURCE_MAXTHREADS_KEY, 1);<a name="line.198"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilter.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilter.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilterSubclass.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilterSubclass.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilterSubclass.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilterSubclass.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilterSubclass.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.DummyReplicator.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.DummyReplicator.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.DummyReplicator.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.DummyReplicator.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.DummyReplicator.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.FailingDummyReplicator.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.FailingDummyReplicator.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.FailingDummyReplicator.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.FailingDummyReplicator.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.FailingDummyReplicator.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.InterClusterReplicationEndpointForTest.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointForTest.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointForTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointForTest.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointForTest.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointForTest.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointReturningFalse.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointReturningFalse.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointReturningFalse.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointReturningFalse.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointReturningFalse.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointWithWALEntryFilter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointWithWALEntryFilter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointWithWALEntryFilter.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointWithWALEntryFilter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.ReplicationEndpointWithWALEntryFilter.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.html
index 79f41fa..bee8222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.html
@@ -134,7 +134,7 @@
<span class="sourceLineNo">126</span> });<a name="line.126"></a>
<span class="sourceLineNo">127</span> }<a name="line.127"></a>
<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test (timeout=120000)<a name="line.129"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void testCustomReplicationEndpoint() throws Exception {<a name="line.130"></a>
<span class="sourceLineNo">131</span> // test installing a custom replication endpoint other than the default one.<a name="line.131"></a>
<span class="sourceLineNo">132</span> admin.addPeer("testCustomReplicationEndpoint",<a name="line.132"></a>
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> admin.removePeer("testCustomReplicationEndpoint");<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> @Test (timeout=120000)<a name="line.168"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
<span class="sourceLineNo">169</span> public void testReplicationEndpointReturnsFalseOnReplicate() throws Exception {<a name="line.169"></a>
<span class="sourceLineNo">170</span> Assert.assertEquals(0, ReplicationEndpointForTest.replicateCount.get());<a name="line.170"></a>
<span class="sourceLineNo">171</span> Assert.assertTrue(!ReplicationEndpointReturningFalse.replicated.get());<a name="line.171"></a>
@@ -209,7 +209,7 @@
<span class="sourceLineNo">201</span> admin.removePeer("testReplicationEndpointReturnsFalseOnReplicate");<a name="line.201"></a>
<span class="sourceLineNo">202</span> }<a name="line.202"></a>
<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test (timeout=120000)<a name="line.204"></a>
+<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
<span class="sourceLineNo">205</span> public void testInterClusterReplication() throws Exception {<a name="line.205"></a>
<span class="sourceLineNo">206</span> final String id = "testInterClusterReplication";<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
@@ -255,7 +255,7 @@
<span class="sourceLineNo">247</span> utility1.deleteTableData(tableName);<a name="line.247"></a>
<span class="sourceLineNo">248</span> }<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> @Test (timeout=120000)<a name="line.250"></a>
+<span class="sourceLineNo">250</span> @Test<a name="line.250"></a>
<span class="sourceLineNo">251</span> public void testWALEntryFilterFromReplicationEndpoint() throws Exception {<a name="line.251"></a>
<span class="sourceLineNo">252</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.252"></a>
<span class="sourceLineNo">253</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.253"></a>
@@ -284,7 +284,7 @@
<span class="sourceLineNo">276</span> admin.removePeer("testWALEntryFilterFromReplicationEndpoint");<a name="line.276"></a>
<span class="sourceLineNo">277</span> }<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test (timeout=120000, expected=IOException.class)<a name="line.279"></a>
+<span class="sourceLineNo">279</span> @Test (expected=IOException.class)<a name="line.279"></a>
<span class="sourceLineNo">280</span> public void testWALEntryFilterAddValidation() throws Exception {<a name="line.280"></a>
<span class="sourceLineNo">281</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.281"></a>
<span class="sourceLineNo">282</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.282"></a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">286</span> admin.addPeer("testWALEntryFilterAddValidation", rpc);<a name="line.286"></a>
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Test (timeout=120000, expected=IOException.class)<a name="line.289"></a>
+<span class="sourceLineNo">289</span> @Test (expected=IOException.class)<a name="line.289"></a>
<span class="sourceLineNo">290</span> public void testWALEntryFilterUpdateValidation() throws Exception {<a name="line.290"></a>
<span class="sourceLineNo">291</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig().setClusterKey(ZKConfig.getZooKeeperClusterKey(conf1))<a name="line.291"></a>
<span class="sourceLineNo">292</span> .setReplicationEndpointImpl(ReplicationEndpointWithWALEntryFilter.class.getName());<a name="line.292"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.html
index 7702504..5f0da23 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.html
@@ -46,7 +46,7 @@
<span class="sourceLineNo">038</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.38"></a>
<span class="sourceLineNo">039</span> HBaseClassTestRule.forClass(TestReplicationKillMasterRS.class);<a name="line.39"></a>
<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> @Test(timeout=300000)<a name="line.41"></a>
+<span class="sourceLineNo">041</span> @Test<a name="line.41"></a>
<span class="sourceLineNo">042</span> public void killOneMasterRS() throws Exception {<a name="line.42"></a>
<span class="sourceLineNo">043</span> loadTableAndKillRS(utility1);<a name="line.43"></a>
<span class="sourceLineNo">044</span> }<a name="line.44"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.html
index df4c38c..d65aa54 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.html
@@ -46,7 +46,7 @@
<span class="sourceLineNo">038</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.38"></a>
<span class="sourceLineNo">039</span> HBaseClassTestRule.forClass(TestReplicationKillSlaveRS.class);<a name="line.39"></a>
<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> @Test(timeout=300000)<a name="line.41"></a>
+<span class="sourceLineNo">041</span> @Test<a name="line.41"></a>
<span class="sourceLineNo">042</span> public void killOneSlaveRS() throws Exception {<a name="line.42"></a>
<span class="sourceLineNo">043</span> loadTableAndKillRS(utility2);<a name="line.43"></a>
<span class="sourceLineNo">044</span> }<a name="line.44"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationStatus.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationStatus.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationStatus.html
index 6714e90..265adbd 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationStatus.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationStatus.html
@@ -65,7 +65,7 @@
<span class="sourceLineNo">057</span> * test : status.getLoad(server).getReplicationLoadSink()<a name="line.57"></a>
<span class="sourceLineNo">058</span> * * @throws Exception<a name="line.58"></a>
<span class="sourceLineNo">059</span> */<a name="line.59"></a>
-<span class="sourceLineNo">060</span> @Test(timeout = 300000)<a name="line.60"></a>
+<span class="sourceLineNo">060</span> @Test<a name="line.60"></a>
<span class="sourceLineNo">061</span> public void testReplicationStatus() throws Exception {<a name="line.61"></a>
<span class="sourceLineNo">062</span> LOG.info("testReplicationStatus");<a name="line.62"></a>
<span class="sourceLineNo">063</span><a name="line.63"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyReplicationListener.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyReplicationListener.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyReplicationListener.html
index 593c59b..f4dc25f 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyReplicationListener.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyReplicationListener.html
@@ -142,7 +142,7 @@
<span class="sourceLineNo">134</span> assertEquals(0, rt.getListOfRegionServers().size());<a name="line.134"></a>
<span class="sourceLineNo">135</span> }<a name="line.135"></a>
<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test(timeout = 30000)<a name="line.137"></a>
+<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
<span class="sourceLineNo">138</span> public void testRegionServerRemovedEvent() throws Exception {<a name="line.138"></a>
<span class="sourceLineNo">139</span> ZKUtil.createAndWatch(zkw,<a name="line.139"></a>
<span class="sourceLineNo">140</span> ZNodePaths.joinZNode(zkw.znodePaths.rsZNode, "hostname2.example.org:1234"),<a name="line.140"></a>
@@ -158,7 +158,7 @@
<span class="sourceLineNo">150</span> assertEquals("hostname2.example.org:1234", rsRemovedData);<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Test(timeout = 30000)<a name="line.153"></a>
+<span class="sourceLineNo">153</span> @Test<a name="line.153"></a>
<span class="sourceLineNo">154</span> public void testPeerNameControl() throws Exception {<a name="line.154"></a>
<span class="sourceLineNo">155</span> int exists = 0;<a name="line.155"></a>
<span class="sourceLineNo">156</span> rp.getPeerStorage().addPeer("6",<a name="line.156"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyServer.html
index 593c59b..f4dc25f 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.DummyServer.html
@@ -142,7 +142,7 @@
<span class="sourceLineNo">134</span> assertEquals(0, rt.getListOfRegionServers().size());<a name="line.134"></a>
<span class="sourceLineNo">135</span> }<a name="line.135"></a>
<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test(timeout = 30000)<a name="line.137"></a>
+<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
<span class="sourceLineNo">138</span> public void testRegionServerRemovedEvent() throws Exception {<a name="line.138"></a>
<span class="sourceLineNo">139</span> ZKUtil.createAndWatch(zkw,<a name="line.139"></a>
<span class="sourceLineNo">140</span> ZNodePaths.joinZNode(zkw.znodePaths.rsZNode, "hostname2.example.org:1234"),<a name="line.140"></a>
@@ -158,7 +158,7 @@
<span class="sourceLineNo">150</span> assertEquals("hostname2.example.org:1234", rsRemovedData);<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Test(timeout = 30000)<a name="line.153"></a>
+<span class="sourceLineNo">153</span> @Test<a name="line.153"></a>
<span class="sourceLineNo">154</span> public void testPeerNameControl() throws Exception {<a name="line.154"></a>
<span class="sourceLineNo">155</span> int exists = 0;<a name="line.155"></a>
<span class="sourceLineNo">156</span> rp.getPeerStorage().addPeer("6",<a name="line.156"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.html
index 593c59b..f4dc25f 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.html
@@ -142,7 +142,7 @@
<span class="sourceLineNo">134</span> assertEquals(0, rt.getListOfRegionServers().size());<a name="line.134"></a>
<span class="sourceLineNo">135</span> }<a name="line.135"></a>
<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test(timeout = 30000)<a name="line.137"></a>
+<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
<span class="sourceLineNo">138</span> public void testRegionServerRemovedEvent() throws Exception {<a name="line.138"></a>
<span class="sourceLineNo">139</span> ZKUtil.createAndWatch(zkw,<a name="line.139"></a>
<span class="sourceLineNo">140</span> ZNodePaths.joinZNode(zkw.znodePaths.rsZNode, "hostname2.example.org:1234"),<a name="line.140"></a>
@@ -158,7 +158,7 @@
<span class="sourceLineNo">150</span> assertEquals("hostname2.example.org:1234", rsRemovedData);<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> @Test(timeout = 30000)<a name="line.153"></a>
+<span class="sourceLineNo">153</span> @Test<a name="line.153"></a>
<span class="sourceLineNo">154</span> public void testPeerNameControl() throws Exception {<a name="line.154"></a>
<span class="sourceLineNo">155</span> int exists = 0;<a name="line.155"></a>
<span class="sourceLineNo">156</span> rp.getPeerStorage().addPeer("6",<a name="line.156"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSink.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSink.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSink.html
index 8482f55..757322b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSink.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSink.html
@@ -179,7 +179,7 @@
<span class="sourceLineNo">171</span> utility1.shutdownMiniCluster();<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Test(timeout = 300000)<a name="line.174"></a>
+<span class="sourceLineNo">174</span> @Test<a name="line.174"></a>
<span class="sourceLineNo">175</span> public void testReplicationWithCellTags() throws Exception {<a name="line.175"></a>
<span class="sourceLineNo">176</span> LOG.info("testSimplePutDelete");<a name="line.176"></a>
<span class="sourceLineNo">177</span> Put put = new Put(ROW);<a name="line.177"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSource.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSource.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSource.html
index 8482f55..757322b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSource.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.TestCoprocessorForTagsAtSource.html
@@ -179,7 +179,7 @@
<span class="sourceLineNo">171</span> utility1.shutdownMiniCluster();<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Test(timeout = 300000)<a name="line.174"></a>
+<span class="sourceLineNo">174</span> @Test<a name="line.174"></a>
<span class="sourceLineNo">175</span> public void testReplicationWithCellTags() throws Exception {<a name="line.175"></a>
<span class="sourceLineNo">176</span> LOG.info("testSimplePutDelete");<a name="line.176"></a>
<span class="sourceLineNo">177</span> Put put = new Put(ROW);<a name="line.177"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.html
index 8482f55..757322b 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationWithTags.html
@@ -179,7 +179,7 @@
<span class="sourceLineNo">171</span> utility1.shutdownMiniCluster();<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Test(timeout = 300000)<a name="line.174"></a>
+<span class="sourceLineNo">174</span> @Test<a name="line.174"></a>
<span class="sourceLineNo">175</span> public void testReplicationWithCellTags() throws Exception {<a name="line.175"></a>
<span class="sourceLineNo">176</span> LOG.info("testSimplePutDelete");<a name="line.176"></a>
<span class="sourceLineNo">177</span> Put put = new Put(ROW);<a name="line.177"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.html
index 3224882..7693fcd 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.html
@@ -165,7 +165,7 @@
<span class="sourceLineNo">157</span> admin.close();<a name="line.157"></a>
<span class="sourceLineNo">158</span> }<a name="line.158"></a>
<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Test (timeout=240000)<a name="line.160"></a>
+<span class="sourceLineNo">160</span> @Test<a name="line.160"></a>
<span class="sourceLineNo">161</span> public void testRegionReplicaReplicationPeerIsCreatedForModifyTable() throws Exception {<a name="line.161"></a>
<span class="sourceLineNo">162</span> // modify a table by adding region replicas. Check whether the replication peer is created<a name="line.162"></a>
<span class="sourceLineNo">163</span> // and replication started.<a name="line.163"></a>
@@ -288,22 +288,22 @@
<span class="sourceLineNo">280</span> }<a name="line.280"></a>
<span class="sourceLineNo">281</span> }<a name="line.281"></a>
<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> @Test(timeout = 240000)<a name="line.283"></a>
+<span class="sourceLineNo">283</span> @Test<a name="line.283"></a>
<span class="sourceLineNo">284</span> public void testRegionReplicaReplicationWith2Replicas() throws Exception {<a name="line.284"></a>
<span class="sourceLineNo">285</span> testRegionReplicaReplication(2);<a name="line.285"></a>
<span class="sourceLineNo">286</span> }<a name="line.286"></a>
<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> @Test(timeout = 240000)<a name="line.288"></a>
+<span class="sourceLineNo">288</span> @Test<a name="line.288"></a>
<span class="sourceLineNo">289</span> public void testRegionReplicaReplicationWith3Replicas() throws Exception {<a name="line.289"></a>
<span class="sourceLineNo">290</span> testRegionReplicaReplication(3);<a name="line.290"></a>
<span class="sourceLineNo">291</span> }<a name="line.291"></a>
<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> @Test(timeout = 240000)<a name="line.293"></a>
+<span class="sourceLineNo">293</span> @Test<a name="line.293"></a>
<span class="sourceLineNo">294</span> public void testRegionReplicaReplicationWith10Replicas() throws Exception {<a name="line.294"></a>
<span class="sourceLineNo">295</span> testRegionReplicaReplication(10);<a name="line.295"></a>
<span class="sourceLineNo">296</span> }<a name="line.296"></a>
<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> @Test (timeout = 240000)<a name="line.298"></a>
+<span class="sourceLineNo">298</span> @Test<a name="line.298"></a>
<span class="sourceLineNo">299</span> public void testRegionReplicaWithoutMemstoreReplication() throws Exception {<a name="line.299"></a>
<span class="sourceLineNo">300</span> int regionReplication = 3;<a name="line.300"></a>
<span class="sourceLineNo">301</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.301"></a>
@@ -335,7 +335,7 @@
<span class="sourceLineNo">327</span> }<a name="line.327"></a>
<span class="sourceLineNo">328</span> }<a name="line.328"></a>
<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> @Test (timeout = 240000)<a name="line.330"></a>
+<span class="sourceLineNo">330</span> @Test<a name="line.330"></a>
<span class="sourceLineNo">331</span> public void testRegionReplicaReplicationForFlushAndCompaction() throws Exception {<a name="line.331"></a>
<span class="sourceLineNo">332</span> // Tests a table with region replication 3. Writes some data, and causes flushes and<a name="line.332"></a>
<span class="sourceLineNo">333</span> // compactions. Verifies that the data is readable from the replicas. Note that this<a name="line.333"></a>
@@ -370,12 +370,12 @@
<span class="sourceLineNo">362</span> }<a name="line.362"></a>
<span class="sourceLineNo">363</span> }<a name="line.363"></a>
<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> @Test (timeout = 240000)<a name="line.365"></a>
+<span class="sourceLineNo">365</span> @Test<a name="line.365"></a>
<span class="sourceLineNo">366</span> public void testRegionReplicaReplicationIgnoresDisabledTables() throws Exception {<a name="line.366"></a>
<span class="sourceLineNo">367</span> testRegionReplicaReplicationIgnoresDisabledTables(false);<a name="line.367"></a>
<span class="sourceLineNo">368</span> }<a name="line.368"></a>
<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> @Test (timeout = 240000)<a name="line.370"></a>
+<span class="sourceLineNo">370</span> @Test<a name="line.370"></a>
<span class="sourceLineNo">371</span> public void testRegionReplicaReplicationIgnoresDroppedTables() throws Exception {<a name="line.371"></a>
<span class="sourceLineNo">372</span> testRegionReplicaReplicationIgnoresDisabledTables(true);<a name="line.372"></a>
<span class="sourceLineNo">373</span> }<a name="line.373"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.WALEditCopro.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.WALEditCopro.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.WALEditCopro.html
index 40182b6..a094497 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.WALEditCopro.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.WALEditCopro.html
@@ -182,7 +182,7 @@
<span class="sourceLineNo">174</span> }<a name="line.174"></a>
<span class="sourceLineNo">175</span> }<a name="line.175"></a>
<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> @Test (timeout = 240000)<a name="line.177"></a>
+<span class="sourceLineNo">177</span> @Test<a name="line.177"></a>
<span class="sourceLineNo">178</span> public void testReplayCallable() throws Exception {<a name="line.178"></a>
<span class="sourceLineNo">179</span> // tests replaying the edits to a secondary region replica using the Callable directly<a name="line.179"></a>
<span class="sourceLineNo">180</span> openRegion(HTU, rs0, hriSecondary);<a name="line.180"></a>
@@ -222,7 +222,7 @@
<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span> }<a name="line.215"></a>
<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> @Test (timeout = 240000)<a name="line.217"></a>
+<span class="sourceLineNo">217</span> @Test<a name="line.217"></a>
<span class="sourceLineNo">218</span> public void testReplayCallableWithRegionMove() throws Exception {<a name="line.218"></a>
<span class="sourceLineNo">219</span> // tests replaying the edits to a secondary region replica using the Callable directly while<a name="line.219"></a>
<span class="sourceLineNo">220</span> // the region is moved to another location.It tests handling of RME.<a name="line.220"></a>
@@ -257,7 +257,7 @@
<span class="sourceLineNo">249</span> connection.close();<a name="line.249"></a>
<span class="sourceLineNo">250</span> }<a name="line.250"></a>
<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> @Test (timeout = 240000)<a name="line.252"></a>
+<span class="sourceLineNo">252</span> @Test<a name="line.252"></a>
<span class="sourceLineNo">253</span> public void testRegionReplicaReplicationEndpointReplicate() throws Exception {<a name="line.253"></a>
<span class="sourceLineNo">254</span> // tests replaying the edits to a secondary region replica using the RRRE.replicate()<a name="line.254"></a>
<span class="sourceLineNo">255</span> openRegion(HTU, rs0, hriSecondary);<a name="line.255"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/656f90de/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.html
index 40182b6..a094497 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.html
@@ -182,7 +182,7 @@
<span class="sourceLineNo">174</span> }<a name="line.174"></a>
<span class="sourceLineNo">175</span> }<a name="line.175"></a>
<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> @Test (timeout = 240000)<a name="line.177"></a>
+<span class="sourceLineNo">177</span> @Test<a name="line.177"></a>
<span class="sourceLineNo">178</span> public void testReplayCallable() throws Exception {<a name="line.178"></a>
<span class="sourceLineNo">179</span> // tests replaying the edits to a secondary region replica using the Callable directly<a name="line.179"></a>
<span class="sourceLineNo">180</span> openRegion(HTU, rs0, hriSecondary);<a name="line.180"></a>
@@ -222,7 +222,7 @@
<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span> }<a name="line.215"></a>
<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> @Test (timeout = 240000)<a name="line.217"></a>
+<span class="sourceLineNo">217</span> @Test<a name="line.217"></a>
<span class="sourceLineNo">218</span> public void testReplayCallableWithRegionMove() throws Exception {<a name="line.218"></a>
<span class="sourceLineNo">219</span> // tests replaying the edits to a secondary region replica using the Callable directly while<a name="line.219"></a>
<span class="sourceLineNo">220</span> // the region is moved to another location.It tests handling of RME.<a name="line.220"></a>
@@ -257,7 +257,7 @@
<span class="sourceLineNo">249</span> connection.close();<a name="line.249"></a>
<span class="sourceLineNo">250</span> }<a name="line.250"></a>
<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> @Test (timeout = 240000)<a name="line.252"></a>
+<span class="sourceLineNo">252</span> @Test<a name="line.252"></a>
<span class="sourceLineNo">253</span> public void testRegionReplicaReplicationEndpointReplicate() throws Exception {<a name="line.253"></a>
<span class="sourceLineNo">254</span> // tests replaying the edits to a secondary region replica using the RRRE.replicate()<a name="line.254"></a>
<span class="sourceLineNo">255</span> openRegion(HTU, rs0, hriSecondary);<a name="line.255"></a>