http://git-wip-us.apache.org/repos/asf/hbase-site/blob/044b3379/apidocs/src-html/org/apache/hadoop/hbase/HConstants.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/HConstants.html 
b/apidocs/src-html/org/apache/hadoop/hbase/HConstants.html
index b222809..1f34ddb 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/HConstants.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/HConstants.html
@@ -237,81 +237,81 @@
 <span class="sourceLineNo">229</span>  /** Default value for ZooKeeper session 
timeout */<a name="line.229"></a>
 <span class="sourceLineNo">230</span>  public static final int 
DEFAULT_ZK_SESSION_TIMEOUT = 180 * 1000;<a name="line.230"></a>
 <span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>  /** Configuration key for whether to 
use ZK.multi */<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  public static final String 
ZOOKEEPER_USEMULTI = "hbase.zookeeper.useMulti";<a name="line.233"></a>
+<span class="sourceLineNo">232</span>  /** Parameter name for port region 
server listens on. */<a name="line.232"></a>
+<span class="sourceLineNo">233</span>  public static final String 
REGIONSERVER_PORT = "hbase.regionserver.port";<a name="line.233"></a>
 <span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>  /** Parameter name for port region 
server listens on. */<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public static final String 
REGIONSERVER_PORT = "hbase.regionserver.port";<a name="line.236"></a>
+<span class="sourceLineNo">235</span>  /** Default port region server listens 
on. */<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  public static final int 
DEFAULT_REGIONSERVER_PORT = 16020;<a name="line.236"></a>
 <span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>  /** Default port region server listens 
on. */<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  public static final int 
DEFAULT_REGIONSERVER_PORT = 16020;<a name="line.239"></a>
+<span class="sourceLineNo">238</span>  /** default port for region server web 
api */<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  public static final int 
DEFAULT_REGIONSERVER_INFOPORT = 16030;<a name="line.239"></a>
 <span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>  /** default port for region server web 
api */<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  public static final int 
DEFAULT_REGIONSERVER_INFOPORT = 16030;<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>  /** A configuration key for 
regionserver info port */<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public static final String 
REGIONSERVER_INFO_PORT =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    "hbase.regionserver.info.port";<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  /** A flag that enables automatic 
selection of regionserver info port */<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  public static final String 
REGIONSERVER_INFO_PORT_AUTO =<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      REGIONSERVER_INFO_PORT + ".auto";<a 
name="line.250"></a>
+<span class="sourceLineNo">241</span>  /** A configuration key for 
regionserver info port */<a name="line.241"></a>
+<span class="sourceLineNo">242</span>  public static final String 
REGIONSERVER_INFO_PORT =<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    "hbase.regionserver.info.port";<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>  /** A flag that enables automatic 
selection of regionserver info port */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>  public static final String 
REGIONSERVER_INFO_PORT_AUTO =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      REGIONSERVER_INFO_PORT + ".auto";<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>  /** Parameter name for what region 
server implementation to use. */<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public static final String 
REGION_SERVER_IMPL= "hbase.regionserver.impl";<a name="line.250"></a>
 <span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>  /** Parameter name for what region 
server implementation to use. */<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  public static final String 
REGION_SERVER_IMPL= "hbase.regionserver.impl";<a name="line.253"></a>
+<span class="sourceLineNo">252</span>  /** Parameter name for what master 
implementation to use. */<a name="line.252"></a>
+<span class="sourceLineNo">253</span>  public static final String MASTER_IMPL= 
"hbase.master.impl";<a name="line.253"></a>
 <span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>  /** Parameter name for what master 
implementation to use. */<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  public static final String MASTER_IMPL= 
"hbase.master.impl";<a name="line.256"></a>
+<span class="sourceLineNo">255</span>  /** Parameter name for what hbase 
client implementation to use. */<a name="line.255"></a>
+<span class="sourceLineNo">256</span>  public static final String 
HBASECLIENT_IMPL= "hbase.hbaseclient.impl";<a name="line.256"></a>
 <span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>  /** Parameter name for what hbase 
client implementation to use. */<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  public static final String 
HBASECLIENT_IMPL= "hbase.hbaseclient.impl";<a name="line.259"></a>
+<span class="sourceLineNo">258</span>  /** Parameter name for how often 
threads should wake up */<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public static final String 
THREAD_WAKE_FREQUENCY = "hbase.server.thread.wakefrequency";<a 
name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  /** Parameter name for how often 
threads should wake up */<a name="line.261"></a>
-<span class="sourceLineNo">262</span>  public static final String 
THREAD_WAKE_FREQUENCY = "hbase.server.thread.wakefrequency";<a 
name="line.262"></a>
+<span class="sourceLineNo">261</span>  /** Default value for thread wake 
frequency */<a name="line.261"></a>
+<span class="sourceLineNo">262</span>  public static final int 
DEFAULT_THREAD_WAKE_FREQUENCY = 10 * 1000;<a name="line.262"></a>
 <span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>  /** Default value for thread wake 
frequency */<a name="line.264"></a>
-<span class="sourceLineNo">265</span>  public static final int 
DEFAULT_THREAD_WAKE_FREQUENCY = 10 * 1000;<a name="line.265"></a>
+<span class="sourceLineNo">264</span>  /** Parameter name for how often we 
should try to write a version file, before failing */<a name="line.264"></a>
+<span class="sourceLineNo">265</span>  public static final String 
VERSION_FILE_WRITE_ATTEMPTS = "hbase.server.versionfile.writeattempts";<a 
name="line.265"></a>
 <span class="sourceLineNo">266</span><a name="line.266"></a>
 <span class="sourceLineNo">267</span>  /** Parameter name for how often we 
should try to write a version file, before failing */<a name="line.267"></a>
-<span class="sourceLineNo">268</span>  public static final String 
VERSION_FILE_WRITE_ATTEMPTS = "hbase.server.versionfile.writeattempts";<a 
name="line.268"></a>
+<span class="sourceLineNo">268</span>  public static final int 
DEFAULT_VERSION_FILE_WRITE_ATTEMPTS = 3;<a name="line.268"></a>
 <span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>  /** Parameter name for how often we 
should try to write a version file, before failing */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  public static final int 
DEFAULT_VERSION_FILE_WRITE_ATTEMPTS = 3;<a name="line.271"></a>
+<span class="sourceLineNo">270</span>  /** Parameter name for how often a 
region should should perform a major compaction */<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  public static final String 
MAJOR_COMPACTION_PERIOD = "hbase.hregion.majorcompaction";<a 
name="line.271"></a>
 <span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>  /** Parameter name for how often a 
region should should perform a major compaction */<a name="line.273"></a>
-<span class="sourceLineNo">274</span>  public static final String 
MAJOR_COMPACTION_PERIOD = "hbase.hregion.majorcompaction";<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span>  /** Parameter name for the maximum 
batch of KVs to be used in flushes and compactions */<a name="line.276"></a>
-<span class="sourceLineNo">277</span>  public static final String 
COMPACTION_KV_MAX = "hbase.hstore.compaction.kv.max";<a name="line.277"></a>
-<span class="sourceLineNo">278</span>  public static final int 
COMPACTION_KV_MAX_DEFAULT = 10;<a name="line.278"></a>
+<span class="sourceLineNo">273</span>  /** Parameter name for the maximum 
batch of KVs to be used in flushes and compactions */<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  public static final String 
COMPACTION_KV_MAX = "hbase.hstore.compaction.kv.max";<a name="line.274"></a>
+<span class="sourceLineNo">275</span>  public static final int 
COMPACTION_KV_MAX_DEFAULT = 10;<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>  /** Parameter name for HBase instance 
root directory */<a name="line.277"></a>
+<span class="sourceLineNo">278</span>  public static final String HBASE_DIR = 
"hbase.rootdir";<a name="line.278"></a>
 <span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>  /** Parameter name for HBase instance 
root directory */<a name="line.280"></a>
-<span class="sourceLineNo">281</span>  public static final String HBASE_DIR = 
"hbase.rootdir";<a name="line.281"></a>
+<span class="sourceLineNo">280</span>  /** Parameter name for HBase client IPC 
pool type */<a name="line.280"></a>
+<span class="sourceLineNo">281</span>  public static final String 
HBASE_CLIENT_IPC_POOL_TYPE = "hbase.client.ipc.pool.type";<a 
name="line.281"></a>
 <span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span>  /** Parameter name for HBase client IPC 
pool type */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  public static final String 
HBASE_CLIENT_IPC_POOL_TYPE = "hbase.client.ipc.pool.type";<a 
name="line.284"></a>
+<span class="sourceLineNo">283</span>  /** Parameter name for HBase client IPC 
pool size */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  public static final String 
HBASE_CLIENT_IPC_POOL_SIZE = "hbase.client.ipc.pool.size";<a 
name="line.284"></a>
 <span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>  /** Parameter name for HBase client IPC 
pool size */<a name="line.286"></a>
-<span class="sourceLineNo">287</span>  public static final String 
HBASE_CLIENT_IPC_POOL_SIZE = "hbase.client.ipc.pool.size";<a 
name="line.287"></a>
+<span class="sourceLineNo">286</span>  /** Parameter name for HBase client 
operation timeout. */<a name="line.286"></a>
+<span class="sourceLineNo">287</span>  public static final String 
HBASE_CLIENT_OPERATION_TIMEOUT = "hbase.client.operation.timeout";<a 
name="line.287"></a>
 <span class="sourceLineNo">288</span><a name="line.288"></a>
 <span class="sourceLineNo">289</span>  /** Parameter name for HBase client 
operation timeout. */<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  public static final String 
HBASE_CLIENT_OPERATION_TIMEOUT = "hbase.client.operation.timeout";<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  /** Parameter name for HBase client 
operation timeout. */<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  public static final String 
HBASE_CLIENT_META_OPERATION_TIMEOUT =<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    
"hbase.client.meta.operation.timeout";<a name="line.294"></a>
+<span class="sourceLineNo">290</span>  public static final String 
HBASE_CLIENT_META_OPERATION_TIMEOUT =<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    
"hbase.client.meta.operation.timeout";<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>  /** Default HBase client operation 
timeout, which is tantamount to a blocking call */<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  public static final int 
DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT = 1200000;<a name="line.294"></a>
 <span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>  /** Default HBase client operation 
timeout, which is tantamount to a blocking call */<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public static final int 
DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT = 1200000;<a name="line.297"></a>
+<span class="sourceLineNo">296</span>  /** Used to construct the name of the 
log directory for a region server */<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public static final String 
HREGION_LOGDIR_NAME = "WALs";<a name="line.297"></a>
 <span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>  /** Used to construct the name of the 
log directory for a region server */<a name="line.299"></a>
-<span class="sourceLineNo">300</span>  public static final String 
HREGION_LOGDIR_NAME = "WALs";<a name="line.300"></a>
+<span class="sourceLineNo">299</span>  /** Used to construct the name of the 
splitlog directory for a region server */<a name="line.299"></a>
+<span class="sourceLineNo">300</span>  public static final String 
SPLIT_LOGDIR_NAME = "splitWAL";<a name="line.300"></a>
 <span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span>  /** Used to construct the name of the 
splitlog directory for a region server */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static final String 
SPLIT_LOGDIR_NAME = "splitWAL";<a name="line.303"></a>
+<span class="sourceLineNo">302</span>  /** Like the previous, but for old logs 
that are about to be deleted */<a name="line.302"></a>
+<span class="sourceLineNo">303</span>  public static final String 
HREGION_OLDLOGDIR_NAME = "oldWALs";<a name="line.303"></a>
 <span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>  /** Like the previous, but for old logs 
that are about to be deleted */<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  public static final String 
HREGION_OLDLOGDIR_NAME = "oldWALs";<a name="line.306"></a>
+<span class="sourceLineNo">305</span>  /** Staging dir used by bulk load */<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>  public static final String 
BULKLOAD_STAGING_DIR_NAME = "staging";<a name="line.306"></a>
 <span class="sourceLineNo">307</span><a name="line.307"></a>
 <span class="sourceLineNo">308</span>  public static final String 
CORRUPT_DIR_NAME = "corrupt";<a name="line.308"></a>
 <span class="sourceLineNo">309</span><a name="line.309"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/044b3379/apidocs/src-html/org/apache/hadoop/hbase/UnknownScannerException.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/UnknownScannerException.html 
b/apidocs/src-html/org/apache/hadoop/hbase/UnknownScannerException.html
index 55732a2..b635bd9 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/UnknownScannerException.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/UnknownScannerException.html
@@ -53,7 +53,11 @@
 <span class="sourceLineNo">045</span>  public UnknownScannerException(String 
s) {<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    super(s);<a name="line.46"></a>
 <span class="sourceLineNo">047</span>  }<a name="line.47"></a>
-<span class="sourceLineNo">048</span>}<a name="line.48"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  public UnknownScannerException(String 
s, Exception e) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    super(s, e);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
+<span class="sourceLineNo">052</span>}<a name="line.52"></a>
 
 
 

Reply via email to