You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/01/22 18:00:43 UTC

[01/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 75eda5673 -> 29e338589


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index ebe1d6b..0a7ba70 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -35,10 +35,10 @@
 <a class="jxr_linenumber" name="25" href="#25">25</a>    requiredArguments = {
 <a class="jxr_linenumber" name="26" href="#26">26</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"regionServer"</span>, type = <span class="jxr_string">"HRegionServer"</span>)},
 <a class="jxr_linenumber" name="27" href="#27">27</a>    optionalArguments = {
-<a class="jxr_linenumber" name="28" href="#28">28</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcn"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="28" href="#28">28</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
 <a class="jxr_linenumber" name="29" href="#29">29</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
 <a class="jxr_linenumber" name="30" href="#30">30</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcv"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="31" href="#31">31</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>)})
+<a class="jxr_linenumber" name="31" href="#31">31</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"bcn"</span>, type = <span class="jxr_string">"String"</span>)})
 <a class="jxr_linenumber" name="32" href="#32">32</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html">RSStatusTmpl</a>
 <a class="jxr_linenumber" name="33" href="#33">33</a>    <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
 <a class="jxr_linenumber" name="34" href="#34">34</a>  {
@@ -79,23 +79,23 @@
 <a class="jxr_linenumber" name="69" href="#69">69</a>        <strong class="jxr_keyword">return</strong> m_regionServer;
 <a class="jxr_linenumber" name="70" href="#70">70</a>      }
 <a class="jxr_linenumber" name="71" href="#71">71</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html">HRegionServer</a> m_regionServer;
-<a class="jxr_linenumber" name="72" href="#72">72</a>      <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="73" href="#73">73</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcn(String bcn)
+<a class="jxr_linenumber" name="72" href="#72">72</a>      <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="73" href="#73">73</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
 <a class="jxr_linenumber" name="74" href="#74">74</a>      {
-<a class="jxr_linenumber" name="75" href="#75">75</a>        <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="76" href="#76">76</a>        m_bcn = bcn;
-<a class="jxr_linenumber" name="77" href="#77">77</a>        m_bcn__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="75" href="#75">75</a>        <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="76" href="#76">76</a>        m_format = format;
+<a class="jxr_linenumber" name="77" href="#77">77</a>        m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="78" href="#78">78</a>      }
-<a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">public</strong> String getBcn()
+<a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">public</strong> String getFormat()
 <a class="jxr_linenumber" name="80" href="#80">80</a>      {
-<a class="jxr_linenumber" name="81" href="#81">81</a>        <strong class="jxr_keyword">return</strong> m_bcn;
+<a class="jxr_linenumber" name="81" href="#81">81</a>        <strong class="jxr_keyword">return</strong> m_format;
 <a class="jxr_linenumber" name="82" href="#82">82</a>      }
-<a class="jxr_linenumber" name="83" href="#83">83</a>      <strong class="jxr_keyword">private</strong> String m_bcn;
-<a class="jxr_linenumber" name="84" href="#84">84</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcn__IsNotDefault()
+<a class="jxr_linenumber" name="83" href="#83">83</a>      <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="84" href="#84">84</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
 <a class="jxr_linenumber" name="85" href="#85">85</a>      {
-<a class="jxr_linenumber" name="86" href="#86">86</a>        <strong class="jxr_keyword">return</strong> m_bcn__IsNotDefault;
+<a class="jxr_linenumber" name="86" href="#86">86</a>        <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
 <a class="jxr_linenumber" name="87" href="#87">87</a>      }
-<a class="jxr_linenumber" name="88" href="#88">88</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcn__IsNotDefault;
+<a class="jxr_linenumber" name="88" href="#88">88</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
 <a class="jxr_linenumber" name="89" href="#89">89</a>      <em class="jxr_comment">// 21, 1</em>
 <a class="jxr_linenumber" name="90" href="#90">90</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
 <a class="jxr_linenumber" name="91" href="#91">91</a>      {
@@ -130,23 +130,23 @@
 <a class="jxr_linenumber" name="120" href="#120">120</a>       <strong class="jxr_keyword">return</strong> m_bcv__IsNotDefault;
 <a class="jxr_linenumber" name="121" href="#121">121</a>     }
 <a class="jxr_linenumber" name="122" href="#122">122</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcv__IsNotDefault;
-<a class="jxr_linenumber" name="123" href="#123">123</a>     <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="124" href="#124">124</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="123" href="#123">123</a>     <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="124" href="#124">124</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setBcn(String bcn)
 <a class="jxr_linenumber" name="125" href="#125">125</a>     {
-<a class="jxr_linenumber" name="126" href="#126">126</a>       <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a>       m_format = format;
-<a class="jxr_linenumber" name="128" href="#128">128</a>       m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="126" href="#126">126</a>       <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="127" href="#127">127</a>       m_bcn = bcn;
+<a class="jxr_linenumber" name="128" href="#128">128</a>       m_bcn__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="129" href="#129">129</a>     }
-<a class="jxr_linenumber" name="130" href="#130">130</a>     <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="130" href="#130">130</a>     <strong class="jxr_keyword">public</strong> String getBcn()
 <a class="jxr_linenumber" name="131" href="#131">131</a>     {
-<a class="jxr_linenumber" name="132" href="#132">132</a>       <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="132" href="#132">132</a>       <strong class="jxr_keyword">return</strong> m_bcn;
 <a class="jxr_linenumber" name="133" href="#133">133</a>     }
-<a class="jxr_linenumber" name="134" href="#134">134</a>     <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="134" href="#134">134</a>     <strong class="jxr_keyword">private</strong> String m_bcn;
+<a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getBcn__IsNotDefault()
 <a class="jxr_linenumber" name="136" href="#136">136</a>     {
-<a class="jxr_linenumber" name="137" href="#137">137</a>       <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="137" href="#137">137</a>       <strong class="jxr_keyword">return</strong> m_bcn__IsNotDefault;
 <a class="jxr_linenumber" name="138" href="#138">138</a>     }
-<a class="jxr_linenumber" name="139" href="#139">139</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="139" href="#139">139</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_bcn__IsNotDefault;
 <a class="jxr_linenumber" name="140" href="#140">140</a>   }
 <a class="jxr_linenumber" name="141" href="#141">141</a>   @Override
 <a class="jxr_linenumber" name="142" href="#142">142</a>   <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -158,10 +158,10 @@
 <a class="jxr_linenumber" name="148" href="#148">148</a>     <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
 <a class="jxr_linenumber" name="149" href="#149">149</a>   }
 <a class="jxr_linenumber" name="150" href="#150">150</a>   
-<a class="jxr_linenumber" name="151" href="#151">151</a>   <strong class="jxr_keyword">protected</strong> String bcn;
-<a class="jxr_linenumber" name="152" href="#152">152</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)
+<a class="jxr_linenumber" name="151" href="#151">151</a>   <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="152" href="#152">152</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)
 <a class="jxr_linenumber" name="153" href="#153">153</a>   {
-<a class="jxr_linenumber" name="154" href="#154">154</a>     (getImplData()).setBcn(p_bcn);
+<a class="jxr_linenumber" name="154" href="#154">154</a>     (getImplData()).setFormat(p_format);
 <a class="jxr_linenumber" name="155" href="#155">155</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="156" href="#156">156</a>   }
 <a class="jxr_linenumber" name="157" href="#157">157</a>   
@@ -179,10 +179,10 @@
 <a class="jxr_linenumber" name="169" href="#169">169</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="170" href="#170">170</a>   }
 <a class="jxr_linenumber" name="171" href="#171">171</a>   
-<a class="jxr_linenumber" name="172" href="#172">172</a>   <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="173" href="#173">173</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="172" href="#172">172</a>   <strong class="jxr_keyword">protected</strong> String bcn;
+<a class="jxr_linenumber" name="173" href="#173">173</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)
 <a class="jxr_linenumber" name="174" href="#174">174</a>   {
-<a class="jxr_linenumber" name="175" href="#175">175</a>     (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="175" href="#175">175</a>     (getImplData()).setBcn(p_bcn);
 <a class="jxr_linenumber" name="176" href="#176">176</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="177" href="#177">177</a>   }
 <a class="jxr_linenumber" name="178" href="#178">178</a>   

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index 4c3715f..eed4399 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -36,15 +36,15 @@
 <a class="jxr_linenumber" name="26" href="#26">26</a>  
 <a class="jxr_linenumber" name="27" href="#27">27</a>  {
 <a class="jxr_linenumber" name="28" href="#28">28</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html">HRegionServer</a> regionServer;
-<a class="jxr_linenumber" name="29" href="#29">29</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcn;
+<a class="jxr_linenumber" name="29" href="#29">29</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
 <a class="jxr_linenumber" name="30" href="#30">30</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
 <a class="jxr_linenumber" name="31" href="#31">31</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcv;
-<a class="jxr_linenumber" name="32" href="#32">32</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="32" href="#32">32</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String bcn;
 <a class="jxr_linenumber" name="33" href="#33">33</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData p_implData)
 <a class="jxr_linenumber" name="34" href="#34">34</a>    {
-<a class="jxr_linenumber" name="35" href="#35">35</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getBcn__IsNotDefault())
+<a class="jxr_linenumber" name="35" href="#35">35</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
 <a class="jxr_linenumber" name="36" href="#36">36</a>      {
-<a class="jxr_linenumber" name="37" href="#37">37</a>        p_implData.setBcn(<span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="37" href="#37">37</a>        p_implData.setFormat(<span class="jxr_string">"html"</span>);
 <a class="jxr_linenumber" name="38" href="#38">38</a>      }
 <a class="jxr_linenumber" name="39" href="#39">39</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
 <a class="jxr_linenumber" name="40" href="#40">40</a>      {
@@ -54,9 +54,9 @@
 <a class="jxr_linenumber" name="44" href="#44">44</a>      {
 <a class="jxr_linenumber" name="45" href="#45">45</a>        p_implData.setBcv(<span class="jxr_string">""</span>);
 <a class="jxr_linenumber" name="46" href="#46">46</a>      }
-<a class="jxr_linenumber" name="47" href="#47">47</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="47" href="#47">47</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getBcn__IsNotDefault())
 <a class="jxr_linenumber" name="48" href="#48">48</a>      {
-<a class="jxr_linenumber" name="49" href="#49">49</a>        p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="49" href="#49">49</a>        p_implData.setBcn(<span class="jxr_string">""</span>);
 <a class="jxr_linenumber" name="50" href="#50">50</a>      }
 <a class="jxr_linenumber" name="51" href="#51">51</a>      <strong class="jxr_keyword">return</strong> p_implData;
 <a class="jxr_linenumber" name="52" href="#52">52</a>    }
@@ -64,10 +64,10 @@
 <a class="jxr_linenumber" name="54" href="#54">54</a>    {
 <a class="jxr_linenumber" name="55" href="#55">55</a>      <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
 <a class="jxr_linenumber" name="56" href="#56">56</a>      regionServer = p_implData.getRegionServer();
-<a class="jxr_linenumber" name="57" href="#57">57</a>      bcn = p_implData.getBcn();
+<a class="jxr_linenumber" name="57" href="#57">57</a>      format = p_implData.getFormat();
 <a class="jxr_linenumber" name="58" href="#58">58</a>      filter = p_implData.getFilter();
 <a class="jxr_linenumber" name="59" href="#59">59</a>      bcv = p_implData.getBcv();
-<a class="jxr_linenumber" name="60" href="#60">60</a>      format = p_implData.getFormat();
+<a class="jxr_linenumber" name="60" href="#60">60</a>      bcn = p_implData.getBcn();
 <a class="jxr_linenumber" name="61" href="#61">61</a>    }
 <a class="jxr_linenumber" name="62" href="#62">62</a>    
 <a class="jxr_linenumber" name="63" href="#63">63</a>    @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/util/HBaseFsck.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/util/HBaseFsck.html b/xref/org/apache/hadoop/hbase/util/HBaseFsck.html
index 3dc06fa..d718085 100644
--- a/xref/org/apache/hadoop/hbase/util/HBaseFsck.html
+++ b/xref/org/apache/hadoop/hbase/util/HBaseFsck.html
@@ -805,7 +805,7 @@
 <a class="jxr_linenumber" name="795" href="#795">795</a>         }
 <a class="jxr_linenumber" name="796" href="#796">796</a>         currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();
 <a class="jxr_linenumber" name="797" href="#797">797</a>         currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();
-<a class="jxr_linenumber" name="798" href="#798">798</a>         currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;
+<a class="jxr_linenumber" name="798" href="#798">798</a>         currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);
 <a class="jxr_linenumber" name="799" href="#799">799</a>         currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);
 <a class="jxr_linenumber" name="800" href="#800">800</a>         <strong class="jxr_keyword">if</strong> (currentRegionBoundariesInformation.metaFirstKey.length == 0)
 <a class="jxr_linenumber" name="801" href="#801">801</a>           currentRegionBoundariesInformation.metaFirstKey = <strong class="jxr_keyword">null</strong>;


[03/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index 6b8b2c3..9ee10ea 100644
--- a/xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -773,7 +773,7 @@
 <a class="jxr_linenumber" name="763" href="#763">763</a> <em class="jxr_javadoccomment">   * Add HBase and its dependencies (only) to the job configuration.</em>
 <a class="jxr_linenumber" name="764" href="#764">764</a> <em class="jxr_javadoccomment">   * &lt;p&gt;</em>
 <a class="jxr_linenumber" name="765" href="#765">765</a> <em class="jxr_javadoccomment">   * This is intended as a low-level API, facilitating code reuse between this</em>
-<a class="jxr_linenumber" name="766" href="#766">766</a> <em class="jxr_javadoccomment">   * class and its mapred counterpart. It also of use to extenral tools that</em>
+<a class="jxr_linenumber" name="766" href="#766">766</a> <em class="jxr_javadoccomment">   * class and its mapred counterpart. It also of use to external tools that</em>
 <a class="jxr_linenumber" name="767" href="#767">767</a> <em class="jxr_javadoccomment">   * need to build a MapReduce job that interacts with HBase but want</em>
 <a class="jxr_linenumber" name="768" href="#768">768</a> <em class="jxr_javadoccomment">   * fine-grained control over the jars shipped to the cluster.</em>
 <a class="jxr_linenumber" name="769" href="#769">769</a> <em class="jxr_javadoccomment">   * &lt;/p&gt;</em>
@@ -782,224 +782,240 @@
 <a class="jxr_linenumber" name="772" href="#772">772</a> <em class="jxr_javadoccomment">   * @see &lt;a href="https://issues.apache.org/jira/browse/PIG-3285"&gt;PIG-3285&lt;/a&gt;</em>
 <a class="jxr_linenumber" name="773" href="#773">773</a> <em class="jxr_javadoccomment">   */</em>
 <a class="jxr_linenumber" name="774" href="#774">774</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> addHBaseDependencyJars(Configuration conf) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="775" href="#775">775</a>     addDependencyJars(conf,
-<a class="jxr_linenumber" name="776" href="#776">776</a>       <em class="jxr_comment">// explicitly pull a class from each module</em>
-<a class="jxr_linenumber" name="777" href="#777">777</a>       org.apache.hadoop.hbase.HConstants.<strong class="jxr_keyword">class</strong>,                      <em class="jxr_comment">// hbase-common</em>
-<a class="jxr_linenumber" name="778" href="#778">778</a>       org.apache.hadoop.hbase.protobuf.generated.ClientProtos.<strong class="jxr_keyword">class</strong>, <em class="jxr_comment">// hbase-protocol</em>
-<a class="jxr_linenumber" name="779" href="#779">779</a>       org.apache.hadoop.hbase.client.Put.<strong class="jxr_keyword">class</strong>,                      <em class="jxr_comment">// hbase-client</em>
-<a class="jxr_linenumber" name="780" href="#780">780</a>       org.apache.hadoop.hbase.CompatibilityFactory.<strong class="jxr_keyword">class</strong>,            <em class="jxr_comment">// hbase-hadoop-compat</em>
-<a class="jxr_linenumber" name="781" href="#781">781</a>       org.apache.hadoop.hbase.mapreduce.TableMapper.<strong class="jxr_keyword">class</strong>,           <em class="jxr_comment">// hbase-server</em>
-<a class="jxr_linenumber" name="782" href="#782">782</a>       <em class="jxr_comment">// pull necessary dependencies</em>
-<a class="jxr_linenumber" name="783" href="#783">783</a>       org.apache.zookeeper.ZooKeeper.<strong class="jxr_keyword">class</strong>,
-<a class="jxr_linenumber" name="784" href="#784">784</a>       io.netty.channel.Channel.<strong class="jxr_keyword">class</strong>,
-<a class="jxr_linenumber" name="785" href="#785">785</a>       com.google.protobuf.Message.<strong class="jxr_keyword">class</strong>,
-<a class="jxr_linenumber" name="786" href="#786">786</a>       com.google.common.collect.Lists.<strong class="jxr_keyword">class</strong>,
-<a class="jxr_linenumber" name="787" href="#787">787</a>       org.apache.htrace.Trace.<strong class="jxr_keyword">class</strong>,
-<a class="jxr_linenumber" name="788" href="#788">788</a>       com.codahale.metrics.MetricRegistry.<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="789" href="#789">789</a>   }
-<a class="jxr_linenumber" name="790" href="#790">790</a> 
-<a class="jxr_linenumber" name="791" href="#791">791</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="792" href="#792">792</a> <em class="jxr_javadoccomment">   * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.</em>
-<a class="jxr_linenumber" name="793" href="#793">793</a> <em class="jxr_javadoccomment">   * Also exposed to shell scripts via `bin/hbase mapredcp`.</em>
-<a class="jxr_linenumber" name="794" href="#794">794</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="795" href="#795">795</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String buildDependencyClasspath(Configuration conf) {
-<a class="jxr_linenumber" name="796" href="#796">796</a>     <strong class="jxr_keyword">if</strong> (conf == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="797" href="#797">797</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Must provide a configuration object."</span>);
-<a class="jxr_linenumber" name="798" href="#798">798</a>     }
-<a class="jxr_linenumber" name="799" href="#799">799</a>     Set&lt;String&gt; paths = <strong class="jxr_keyword">new</strong> HashSet&lt;String&gt;(conf.getStringCollection(<span class="jxr_string">"tmpjars"</span>));
-<a class="jxr_linenumber" name="800" href="#800">800</a>     <strong class="jxr_keyword">if</strong> (paths.size() == 0) {
-<a class="jxr_linenumber" name="801" href="#801">801</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Configuration contains no tmpjars."</span>);
-<a class="jxr_linenumber" name="802" href="#802">802</a>     }
-<a class="jxr_linenumber" name="803" href="#803">803</a>     StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="804" href="#804">804</a>     <strong class="jxr_keyword">for</strong> (String s : paths) {
-<a class="jxr_linenumber" name="805" href="#805">805</a>       <em class="jxr_comment">// entries can take the form 'file:/path/to/file.jar'.</em>
-<a class="jxr_linenumber" name="806" href="#806">806</a>       <strong class="jxr_keyword">int</strong> idx = s.indexOf(<span class="jxr_string">":"</span>);
-<a class="jxr_linenumber" name="807" href="#807">807</a>       <strong class="jxr_keyword">if</strong> (idx != -1) s = s.substring(idx + 1);
-<a class="jxr_linenumber" name="808" href="#808">808</a>       <strong class="jxr_keyword">if</strong> (sb.length() &gt; 0) sb.append(File.pathSeparator);
-<a class="jxr_linenumber" name="809" href="#809">809</a>       sb.append(s);
-<a class="jxr_linenumber" name="810" href="#810">810</a>     }
-<a class="jxr_linenumber" name="811" href="#811">811</a>     <strong class="jxr_keyword">return</strong> sb.toString();
-<a class="jxr_linenumber" name="812" href="#812">812</a>   }
-<a class="jxr_linenumber" name="813" href="#813">813</a> 
-<a class="jxr_linenumber" name="814" href="#814">814</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="815" href="#815">815</a> <em class="jxr_javadoccomment">   * Add the HBase dependency jars as well as jars for any of the configured</em>
-<a class="jxr_linenumber" name="816" href="#816">816</a> <em class="jxr_javadoccomment">   * job classes to the job configuration, so that JobClient will ship them</em>
-<a class="jxr_linenumber" name="817" href="#817">817</a> <em class="jxr_javadoccomment">   * to the cluster and add them to the DistributedCache.</em>
-<a class="jxr_linenumber" name="818" href="#818">818</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="819" href="#819">819</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> addDependencyJars(Job job) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="820" href="#820">820</a>     addHBaseDependencyJars(job.getConfiguration());
-<a class="jxr_linenumber" name="821" href="#821">821</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="822" href="#822">822</a>       addDependencyJars(job.getConfiguration(),
-<a class="jxr_linenumber" name="823" href="#823">823</a>           <em class="jxr_comment">// when making changes here, consider also mapred.TableMapReduceUtil</em>
-<a class="jxr_linenumber" name="824" href="#824">824</a>           <em class="jxr_comment">// pull job classes</em>
-<a class="jxr_linenumber" name="825" href="#825">825</a>           job.getMapOutputKeyClass(),
-<a class="jxr_linenumber" name="826" href="#826">826</a>           job.getMapOutputValueClass(),
-<a class="jxr_linenumber" name="827" href="#827">827</a>           job.getInputFormatClass(),
-<a class="jxr_linenumber" name="828" href="#828">828</a>           job.getOutputKeyClass(),
-<a class="jxr_linenumber" name="829" href="#829">829</a>           job.getOutputValueClass(),
-<a class="jxr_linenumber" name="830" href="#830">830</a>           job.getOutputFormatClass(),
-<a class="jxr_linenumber" name="831" href="#831">831</a>           job.getPartitionerClass(),
-<a class="jxr_linenumber" name="832" href="#832">832</a>           job.getCombinerClass());
-<a class="jxr_linenumber" name="833" href="#833">833</a>     } <strong class="jxr_keyword">catch</strong> (ClassNotFoundException e) {
-<a class="jxr_linenumber" name="834" href="#834">834</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(e);
-<a class="jxr_linenumber" name="835" href="#835">835</a>     }
-<a class="jxr_linenumber" name="836" href="#836">836</a>   }
-<a class="jxr_linenumber" name="837" href="#837">837</a> 
-<a class="jxr_linenumber" name="838" href="#838">838</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="839" href="#839">839</a> <em class="jxr_javadoccomment">   * Add the jars containing the given classes to the job's configuration</em>
-<a class="jxr_linenumber" name="840" href="#840">840</a> <em class="jxr_javadoccomment">   * such that JobClient will ship them to the cluster and add them to</em>
-<a class="jxr_linenumber" name="841" href="#841">841</a> <em class="jxr_javadoccomment">   * the DistributedCache.</em>
-<a class="jxr_linenumber" name="842" href="#842">842</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="843" href="#843">843</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> addDependencyJars(Configuration conf,
-<a class="jxr_linenumber" name="844" href="#844">844</a>       Class&lt;?&gt;... classes) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="845" href="#845">845</a> 
-<a class="jxr_linenumber" name="846" href="#846">846</a>     FileSystem localFs = FileSystem.getLocal(conf);
-<a class="jxr_linenumber" name="847" href="#847">847</a>     Set&lt;String&gt; jars = <strong class="jxr_keyword">new</strong> HashSet&lt;String&gt;();
-<a class="jxr_linenumber" name="848" href="#848">848</a>     <em class="jxr_comment">// Add jars that are already in the tmpjars variable</em>
-<a class="jxr_linenumber" name="849" href="#849">849</a>     jars.addAll(conf.getStringCollection(<span class="jxr_string">"tmpjars"</span>));
-<a class="jxr_linenumber" name="850" href="#850">850</a> 
-<a class="jxr_linenumber" name="851" href="#851">851</a>     <em class="jxr_comment">// add jars as we find them to a map of contents jar name so that we can avoid</em>
-<a class="jxr_linenumber" name="852" href="#852">852</a>     <em class="jxr_comment">// creating new jars for classes that have already been packaged.</em>
-<a class="jxr_linenumber" name="853" href="#853">853</a>     Map&lt;String, String&gt; packagedClasses = <strong class="jxr_keyword">new</strong> HashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="854" href="#854">854</a> 
-<a class="jxr_linenumber" name="855" href="#855">855</a>     <em class="jxr_comment">// Add jars containing the specified classes</em>
-<a class="jxr_linenumber" name="856" href="#856">856</a>     <strong class="jxr_keyword">for</strong> (Class&lt;?&gt; clazz : classes) {
-<a class="jxr_linenumber" name="857" href="#857">857</a>       <strong class="jxr_keyword">if</strong> (clazz == <strong class="jxr_keyword">null</strong>) <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="858" href="#858">858</a> 
-<a class="jxr_linenumber" name="859" href="#859">859</a>       Path path = findOrCreateJar(clazz, localFs, packagedClasses);
-<a class="jxr_linenumber" name="860" href="#860">860</a>       <strong class="jxr_keyword">if</strong> (path == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="861" href="#861">861</a>         LOG.warn(<span class="jxr_string">"Could not find jar for class "</span> + clazz +
-<a class="jxr_linenumber" name="862" href="#862">862</a>                  <span class="jxr_string">" in order to ship it to the cluster."</span>);
-<a class="jxr_linenumber" name="863" href="#863">863</a>         <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="864" href="#864">864</a>       }
-<a class="jxr_linenumber" name="865" href="#865">865</a>       <strong class="jxr_keyword">if</strong> (!localFs.exists(path)) {
-<a class="jxr_linenumber" name="866" href="#866">866</a>         LOG.warn(<span class="jxr_string">"Could not validate jar file "</span> + path + <span class="jxr_string">" for class "</span>
-<a class="jxr_linenumber" name="867" href="#867">867</a>                  + clazz);
-<a class="jxr_linenumber" name="868" href="#868">868</a>         <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="869" href="#869">869</a>       }
-<a class="jxr_linenumber" name="870" href="#870">870</a>       jars.add(path.toString());
-<a class="jxr_linenumber" name="871" href="#871">871</a>     }
-<a class="jxr_linenumber" name="872" href="#872">872</a>     <strong class="jxr_keyword">if</strong> (jars.isEmpty()) <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="873" href="#873">873</a> 
-<a class="jxr_linenumber" name="874" href="#874">874</a>     conf.set(<span class="jxr_string">"tmpjars"</span>, StringUtils.arrayToString(jars.toArray(<strong class="jxr_keyword">new</strong> String[jars.size()])));
-<a class="jxr_linenumber" name="875" href="#875">875</a>   }
-<a class="jxr_linenumber" name="876" href="#876">876</a> 
-<a class="jxr_linenumber" name="877" href="#877">877</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="878" href="#878">878</a> <em class="jxr_javadoccomment">   * Finds the Jar for a class or creates it if it doesn't exist. If the class is in</em>
-<a class="jxr_linenumber" name="879" href="#879">879</a> <em class="jxr_javadoccomment">   * a directory in the classpath, it creates a Jar on the fly with the</em>
-<a class="jxr_linenumber" name="880" href="#880">880</a> <em class="jxr_javadoccomment">   * contents of the directory and returns the path to that Jar. If a Jar is</em>
-<a class="jxr_linenumber" name="881" href="#881">881</a> <em class="jxr_javadoccomment">   * created, it is created in the system temporary directory. Otherwise,</em>
-<a class="jxr_linenumber" name="882" href="#882">882</a> <em class="jxr_javadoccomment">   * returns an existing jar that contains a class of the same name. Maintains</em>
-<a class="jxr_linenumber" name="883" href="#883">883</a> <em class="jxr_javadoccomment">   * a mapping from jar contents to the tmp jar created.</em>
-<a class="jxr_linenumber" name="884" href="#884">884</a> <em class="jxr_javadoccomment">   * @param my_class the class to find.</em>
-<a class="jxr_linenumber" name="885" href="#885">885</a> <em class="jxr_javadoccomment">   * @param fs the FileSystem with which to qualify the returned path.</em>
-<a class="jxr_linenumber" name="886" href="#886">886</a> <em class="jxr_javadoccomment">   * @param packagedClasses a map of class name to path.</em>
-<a class="jxr_linenumber" name="887" href="#887">887</a> <em class="jxr_javadoccomment">   * @return a jar file that contains the class.</em>
-<a class="jxr_linenumber" name="888" href="#888">888</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
-<a class="jxr_linenumber" name="889" href="#889">889</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="890" href="#890">890</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Path findOrCreateJar(Class&lt;?&gt; my_<strong class="jxr_keyword">class</strong>, FileSystem fs,
-<a class="jxr_linenumber" name="891" href="#891">891</a>       Map&lt;String, String&gt; packagedClasses)
-<a class="jxr_linenumber" name="892" href="#892">892</a>   <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="893" href="#893">893</a>     <em class="jxr_comment">// attempt to locate an existing jar for the class.</em>
-<a class="jxr_linenumber" name="894" href="#894">894</a>     String jar = findContainingJar(my_<strong class="jxr_keyword">class</strong>, packagedClasses);
-<a class="jxr_linenumber" name="895" href="#895">895</a>     <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == jar || jar.isEmpty()) {
-<a class="jxr_linenumber" name="896" href="#896">896</a>       jar = getJar(my_<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="897" href="#897">897</a>       updateMap(jar, packagedClasses);
-<a class="jxr_linenumber" name="898" href="#898">898</a>     }
-<a class="jxr_linenumber" name="899" href="#899">899</a> 
-<a class="jxr_linenumber" name="900" href="#900">900</a>     <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == jar || jar.isEmpty()) {
-<a class="jxr_linenumber" name="901" href="#901">901</a>       <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="902" href="#902">902</a>     }
-<a class="jxr_linenumber" name="903" href="#903">903</a> 
-<a class="jxr_linenumber" name="904" href="#904">904</a>     LOG.debug(String.format(<span class="jxr_string">"For class %s, using jar %s"</span>, my_<strong class="jxr_keyword">class</strong>.getName(), jar));
-<a class="jxr_linenumber" name="905" href="#905">905</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Path(jar).makeQualified(fs);
-<a class="jxr_linenumber" name="906" href="#906">906</a>   }
-<a class="jxr_linenumber" name="907" href="#907">907</a> 
-<a class="jxr_linenumber" name="908" href="#908">908</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="909" href="#909">909</a> <em class="jxr_javadoccomment">   * Add entries to &lt;code&gt;packagedClasses&lt;/code&gt; corresponding to class files</em>
-<a class="jxr_linenumber" name="910" href="#910">910</a> <em class="jxr_javadoccomment">   * contained in &lt;code&gt;jar&lt;/code&gt;.</em>
-<a class="jxr_linenumber" name="911" href="#911">911</a> <em class="jxr_javadoccomment">   * @param jar The jar who's content to list.</em>
-<a class="jxr_linenumber" name="912" href="#912">912</a> <em class="jxr_javadoccomment">   * @param packagedClasses map[class -&gt; jar]</em>
-<a class="jxr_linenumber" name="913" href="#913">913</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="914" href="#914">914</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> updateMap(String jar, Map&lt;String, String&gt; packagedClasses) <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="915" href="#915">915</a>     <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == jar || jar.isEmpty()) {
-<a class="jxr_linenumber" name="916" href="#916">916</a>       <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="917" href="#917">917</a>     }
-<a class="jxr_linenumber" name="918" href="#918">918</a>     ZipFile zip = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="919" href="#919">919</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="920" href="#920">920</a>       zip = <strong class="jxr_keyword">new</strong> ZipFile(jar);
-<a class="jxr_linenumber" name="921" href="#921">921</a>       <strong class="jxr_keyword">for</strong> (Enumeration&lt;? <strong class="jxr_keyword">extends</strong> ZipEntry&gt; iter = zip.entries(); iter.hasMoreElements();) {
-<a class="jxr_linenumber" name="922" href="#922">922</a>         ZipEntry entry = iter.nextElement();
-<a class="jxr_linenumber" name="923" href="#923">923</a>         <strong class="jxr_keyword">if</strong> (entry.getName().endsWith(<span class="jxr_string">"class"</span>)) {
-<a class="jxr_linenumber" name="924" href="#924">924</a>           packagedClasses.put(entry.getName(), jar);
-<a class="jxr_linenumber" name="925" href="#925">925</a>         }
-<a class="jxr_linenumber" name="926" href="#926">926</a>       }
-<a class="jxr_linenumber" name="927" href="#927">927</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="928" href="#928">928</a>       <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != zip) zip.close();
-<a class="jxr_linenumber" name="929" href="#929">929</a>     }
-<a class="jxr_linenumber" name="930" href="#930">930</a>   }
-<a class="jxr_linenumber" name="931" href="#931">931</a> 
-<a class="jxr_linenumber" name="932" href="#932">932</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="933" href="#933">933</a> <em class="jxr_javadoccomment">   * Find a jar that contains a class of the same name, if any. It will return</em>
-<a class="jxr_linenumber" name="934" href="#934">934</a> <em class="jxr_javadoccomment">   * a jar file, even if that is not the first thing on the class path that</em>
-<a class="jxr_linenumber" name="935" href="#935">935</a> <em class="jxr_javadoccomment">   * has a class with the same name. Looks first on the classpath and then in</em>
-<a class="jxr_linenumber" name="936" href="#936">936</a> <em class="jxr_javadoccomment">   * the &lt;code&gt;packagedClasses&lt;/code&gt; map.</em>
-<a class="jxr_linenumber" name="937" href="#937">937</a> <em class="jxr_javadoccomment">   * @param my_class the class to find.</em>
-<a class="jxr_linenumber" name="938" href="#938">938</a> <em class="jxr_javadoccomment">   * @return a jar file that contains the class, or null.</em>
-<a class="jxr_linenumber" name="939" href="#939">939</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
-<a class="jxr_linenumber" name="940" href="#940">940</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="941" href="#941">941</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String findContainingJar(Class&lt;?&gt; my_<strong class="jxr_keyword">class</strong>, Map&lt;String, String&gt; packagedClasses)
-<a class="jxr_linenumber" name="942" href="#942">942</a>       <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="943" href="#943">943</a>     ClassLoader loader = my_<strong class="jxr_keyword">class</strong>.getClassLoader();
-<a class="jxr_linenumber" name="944" href="#944">944</a> 
-<a class="jxr_linenumber" name="945" href="#945">945</a>     String <strong class="jxr_keyword">class</strong>_file = my_<strong class="jxr_keyword">class</strong>.getName().replaceAll(<span class="jxr_string">"&#92;&#92;."</span>, <span class="jxr_string">"/"</span>) + <span class="jxr_string">".class"</span>;
-<a class="jxr_linenumber" name="946" href="#946">946</a> 
-<a class="jxr_linenumber" name="947" href="#947">947</a>     <strong class="jxr_keyword">if</strong> (loader != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="948" href="#948">948</a>       <em class="jxr_comment">// first search the classpath</em>
-<a class="jxr_linenumber" name="949" href="#949">949</a>       <strong class="jxr_keyword">for</strong> (Enumeration&lt;URL&gt; itr = loader.getResources(<strong class="jxr_keyword">class</strong>_file); itr.hasMoreElements();) {
-<a class="jxr_linenumber" name="950" href="#950">950</a>         URL url = itr.nextElement();
-<a class="jxr_linenumber" name="951" href="#951">951</a>         <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"jar"</span>.equals(url.getProtocol())) {
-<a class="jxr_linenumber" name="952" href="#952">952</a>           String toReturn = url.getPath();
-<a class="jxr_linenumber" name="953" href="#953">953</a>           <strong class="jxr_keyword">if</strong> (toReturn.startsWith(<span class="jxr_string">"file:"</span>)) {
-<a class="jxr_linenumber" name="954" href="#954">954</a>             toReturn = toReturn.substring(<span class="jxr_string">"file:"</span>.length());
-<a class="jxr_linenumber" name="955" href="#955">955</a>           }
-<a class="jxr_linenumber" name="956" href="#956">956</a>           <em class="jxr_comment">// URLDecoder is a misnamed class, since it actually decodes</em>
-<a class="jxr_linenumber" name="957" href="#957">957</a>           <em class="jxr_comment">// x-www-form-urlencoded MIME type rather than actual</em>
-<a class="jxr_linenumber" name="958" href="#958">958</a>           <em class="jxr_comment">// URL encoding (which the file path has). Therefore it would</em>
-<a class="jxr_linenumber" name="959" href="#959">959</a>           <em class="jxr_comment">// decode +s to ' 's which is incorrect (spaces are actually</em>
-<a class="jxr_linenumber" name="960" href="#960">960</a>           <em class="jxr_comment">// either unencoded or encoded as "%20"). Replace +s first, so</em>
-<a class="jxr_linenumber" name="961" href="#961">961</a>           <em class="jxr_comment">// that they are kept sacred during the decoding process.</em>
-<a class="jxr_linenumber" name="962" href="#962">962</a>           toReturn = toReturn.replaceAll(<span class="jxr_string">"&#92;&#92;+"</span>, <span class="jxr_string">"%2B"</span>);
-<a class="jxr_linenumber" name="963" href="#963">963</a>           toReturn = URLDecoder.decode(toReturn, <span class="jxr_string">"UTF-8"</span>);
-<a class="jxr_linenumber" name="964" href="#964">964</a>           <strong class="jxr_keyword">return</strong> toReturn.replaceAll(<span class="jxr_string">"!.*$"</span>, <span class="jxr_string">""</span>);
-<a class="jxr_linenumber" name="965" href="#965">965</a>         }
-<a class="jxr_linenumber" name="966" href="#966">966</a>       }
-<a class="jxr_linenumber" name="967" href="#967">967</a>     }
-<a class="jxr_linenumber" name="968" href="#968">968</a> 
-<a class="jxr_linenumber" name="969" href="#969">969</a>     <em class="jxr_comment">// now look in any jars we've packaged using JarFinder. Returns null when</em>
-<a class="jxr_linenumber" name="970" href="#970">970</a>     <em class="jxr_comment">// no jar is found.</em>
-<a class="jxr_linenumber" name="971" href="#971">971</a>     <strong class="jxr_keyword">return</strong> packagedClasses.get(<strong class="jxr_keyword">class</strong>_file);
-<a class="jxr_linenumber" name="972" href="#972">972</a>   }
-<a class="jxr_linenumber" name="973" href="#973">973</a> 
-<a class="jxr_linenumber" name="974" href="#974">974</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="975" href="#975">975</a> <em class="jxr_javadoccomment">   * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job</em>
-<a class="jxr_linenumber" name="976" href="#976">976</a> <em class="jxr_javadoccomment">   * configuration contexts (HBASE-8140) and also for testing on MRv2.</em>
-<a class="jxr_linenumber" name="977" href="#977">977</a> <em class="jxr_javadoccomment">   * check if we have HADOOP-9426.</em>
-<a class="jxr_linenumber" name="978" href="#978">978</a> <em class="jxr_javadoccomment">   * @param my_class the class to find.</em>
-<a class="jxr_linenumber" name="979" href="#979">979</a> <em class="jxr_javadoccomment">   * @return a jar file that contains the class, or null.</em>
-<a class="jxr_linenumber" name="980" href="#980">980</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="981" href="#981">981</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getJar(Class&lt;?&gt; my_<strong class="jxr_keyword">class</strong>) {
-<a class="jxr_linenumber" name="982" href="#982">982</a>     String ret = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="983" href="#983">983</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="984" href="#984">984</a>       ret = JarFinder.getJar(my_<strong class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="985" href="#985">985</a>     } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="986" href="#986">986</a>       <em class="jxr_comment">// toss all other exceptions, related to reflection failure</em>
-<a class="jxr_linenumber" name="987" href="#987">987</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"getJar invocation failed."</span>, e);
-<a class="jxr_linenumber" name="988" href="#988">988</a>     }
+<a class="jxr_linenumber" name="775" href="#775">775</a> 
+<a class="jxr_linenumber" name="776" href="#776">776</a>     <em class="jxr_comment">// PrefixTreeCodec is part of the hbase-prefix-tree module. If not included in MR jobs jar</em>
+<a class="jxr_linenumber" name="777" href="#777">777</a>     <em class="jxr_comment">// dependencies, MR jobs that write encoded hfiles will fail.</em>
+<a class="jxr_linenumber" name="778" href="#778">778</a>     <em class="jxr_comment">// We used reflection here so to prevent a circular module dependency.</em>
+<a class="jxr_linenumber" name="779" href="#779">779</a>     <em class="jxr_comment">// TODO - if we extract the MR into a module, make it depend on hbase-prefix-tree.</em>
+<a class="jxr_linenumber" name="780" href="#780">780</a>     Class prefixTreeCodecClass = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="781" href="#781">781</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="782" href="#782">782</a>       prefixTreeCodecClass =
+<a class="jxr_linenumber" name="783" href="#783">783</a>           Class.forName(<span class="jxr_string">"org.apache.hadoop.hbase.code.prefixtree.PrefixTreeCodec"</span>);
+<a class="jxr_linenumber" name="784" href="#784">784</a>     } <strong class="jxr_keyword">catch</strong> (ClassNotFoundException e) {
+<a class="jxr_linenumber" name="785" href="#785">785</a>       <em class="jxr_comment">// this will show up in unit tests but should not show in real deployments</em>
+<a class="jxr_linenumber" name="786" href="#786">786</a>       LOG.warn(<span class="jxr_string">"The hbase-prefix-tree module jar containing PrefixTreeCodec is not present."</span> +
+<a class="jxr_linenumber" name="787" href="#787">787</a>           <span class="jxr_string">"  Continuing without it."</span>);
+<a class="jxr_linenumber" name="788" href="#788">788</a>     }
+<a class="jxr_linenumber" name="789" href="#789">789</a> 
+<a class="jxr_linenumber" name="790" href="#790">790</a>     addDependencyJars(conf,
+<a class="jxr_linenumber" name="791" href="#791">791</a>       <em class="jxr_comment">// explicitly pull a class from each module</em>
+<a class="jxr_linenumber" name="792" href="#792">792</a>       org.apache.hadoop.hbase.HConstants.<strong class="jxr_keyword">class</strong>,                      <em class="jxr_comment">// hbase-common</em>
+<a class="jxr_linenumber" name="793" href="#793">793</a>       org.apache.hadoop.hbase.protobuf.generated.ClientProtos.<strong class="jxr_keyword">class</strong>, <em class="jxr_comment">// hbase-protocol</em>
+<a class="jxr_linenumber" name="794" href="#794">794</a>       org.apache.hadoop.hbase.client.Put.<strong class="jxr_keyword">class</strong>,                      <em class="jxr_comment">// hbase-client</em>
+<a class="jxr_linenumber" name="795" href="#795">795</a>       org.apache.hadoop.hbase.CompatibilityFactory.<strong class="jxr_keyword">class</strong>,            <em class="jxr_comment">// hbase-hadoop-compat</em>
+<a class="jxr_linenumber" name="796" href="#796">796</a>       org.apache.hadoop.hbase.mapreduce.TableMapper.<strong class="jxr_keyword">class</strong>,           <em class="jxr_comment">// hbase-server</em>
+<a class="jxr_linenumber" name="797" href="#797">797</a>       prefixTreeCodecClass, <em class="jxr_comment">//  hbase-prefix-tree (if null will be skipped)</em>
+<a class="jxr_linenumber" name="798" href="#798">798</a>       <em class="jxr_comment">// pull necessary dependencies</em>
+<a class="jxr_linenumber" name="799" href="#799">799</a>       org.apache.zookeeper.ZooKeeper.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="800" href="#800">800</a>       io.netty.channel.Channel.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="801" href="#801">801</a>       com.google.protobuf.Message.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="802" href="#802">802</a>       com.google.common.collect.Lists.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="803" href="#803">803</a>       org.apache.htrace.Trace.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="804" href="#804">804</a>       com.codahale.metrics.MetricRegistry.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="805" href="#805">805</a>   }
+<a class="jxr_linenumber" name="806" href="#806">806</a> 
+<a class="jxr_linenumber" name="807" href="#807">807</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="808" href="#808">808</a> <em class="jxr_javadoccomment">   * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.</em>
+<a class="jxr_linenumber" name="809" href="#809">809</a> <em class="jxr_javadoccomment">   * Also exposed to shell scripts via `bin/hbase mapredcp`.</em>
+<a class="jxr_linenumber" name="810" href="#810">810</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="811" href="#811">811</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String buildDependencyClasspath(Configuration conf) {
+<a class="jxr_linenumber" name="812" href="#812">812</a>     <strong class="jxr_keyword">if</strong> (conf == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="813" href="#813">813</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Must provide a configuration object."</span>);
+<a class="jxr_linenumber" name="814" href="#814">814</a>     }
+<a class="jxr_linenumber" name="815" href="#815">815</a>     Set&lt;String&gt; paths = <strong class="jxr_keyword">new</strong> HashSet&lt;String&gt;(conf.getStringCollection(<span class="jxr_string">"tmpjars"</span>));
+<a class="jxr_linenumber" name="816" href="#816">816</a>     <strong class="jxr_keyword">if</strong> (paths.size() == 0) {
+<a class="jxr_linenumber" name="817" href="#817">817</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException(<span class="jxr_string">"Configuration contains no tmpjars."</span>);
+<a class="jxr_linenumber" name="818" href="#818">818</a>     }
+<a class="jxr_linenumber" name="819" href="#819">819</a>     StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="820" href="#820">820</a>     <strong class="jxr_keyword">for</strong> (String s : paths) {
+<a class="jxr_linenumber" name="821" href="#821">821</a>       <em class="jxr_comment">// entries can take the form 'file:/path/to/file.jar'.</em>
+<a class="jxr_linenumber" name="822" href="#822">822</a>       <strong class="jxr_keyword">int</strong> idx = s.indexOf(<span class="jxr_string">":"</span>);
+<a class="jxr_linenumber" name="823" href="#823">823</a>       <strong class="jxr_keyword">if</strong> (idx != -1) s = s.substring(idx + 1);
+<a class="jxr_linenumber" name="824" href="#824">824</a>       <strong class="jxr_keyword">if</strong> (sb.length() &gt; 0) sb.append(File.pathSeparator);
+<a class="jxr_linenumber" name="825" href="#825">825</a>       sb.append(s);
+<a class="jxr_linenumber" name="826" href="#826">826</a>     }
+<a class="jxr_linenumber" name="827" href="#827">827</a>     <strong class="jxr_keyword">return</strong> sb.toString();
+<a class="jxr_linenumber" name="828" href="#828">828</a>   }
+<a class="jxr_linenumber" name="829" href="#829">829</a> 
+<a class="jxr_linenumber" name="830" href="#830">830</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="831" href="#831">831</a> <em class="jxr_javadoccomment">   * Add the HBase dependency jars as well as jars for any of the configured</em>
+<a class="jxr_linenumber" name="832" href="#832">832</a> <em class="jxr_javadoccomment">   * job classes to the job configuration, so that JobClient will ship them</em>
+<a class="jxr_linenumber" name="833" href="#833">833</a> <em class="jxr_javadoccomment">   * to the cluster and add them to the DistributedCache.</em>
+<a class="jxr_linenumber" name="834" href="#834">834</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="835" href="#835">835</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> addDependencyJars(Job job) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="836" href="#836">836</a>     addHBaseDependencyJars(job.getConfiguration());
+<a class="jxr_linenumber" name="837" href="#837">837</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="838" href="#838">838</a>       addDependencyJars(job.getConfiguration(),
+<a class="jxr_linenumber" name="839" href="#839">839</a>           <em class="jxr_comment">// when making changes here, consider also mapred.TableMapReduceUtil</em>
+<a class="jxr_linenumber" name="840" href="#840">840</a>           <em class="jxr_comment">// pull job classes</em>
+<a class="jxr_linenumber" name="841" href="#841">841</a>           job.getMapOutputKeyClass(),
+<a class="jxr_linenumber" name="842" href="#842">842</a>           job.getMapOutputValueClass(),
+<a class="jxr_linenumber" name="843" href="#843">843</a>           job.getInputFormatClass(),
+<a class="jxr_linenumber" name="844" href="#844">844</a>           job.getOutputKeyClass(),
+<a class="jxr_linenumber" name="845" href="#845">845</a>           job.getOutputValueClass(),
+<a class="jxr_linenumber" name="846" href="#846">846</a>           job.getOutputFormatClass(),
+<a class="jxr_linenumber" name="847" href="#847">847</a>           job.getPartitionerClass(),
+<a class="jxr_linenumber" name="848" href="#848">848</a>           job.getCombinerClass());
+<a class="jxr_linenumber" name="849" href="#849">849</a>     } <strong class="jxr_keyword">catch</strong> (ClassNotFoundException e) {
+<a class="jxr_linenumber" name="850" href="#850">850</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(e);
+<a class="jxr_linenumber" name="851" href="#851">851</a>     }
+<a class="jxr_linenumber" name="852" href="#852">852</a>   }
+<a class="jxr_linenumber" name="853" href="#853">853</a> 
+<a class="jxr_linenumber" name="854" href="#854">854</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="855" href="#855">855</a> <em class="jxr_javadoccomment">   * Add the jars containing the given classes to the job's configuration</em>
+<a class="jxr_linenumber" name="856" href="#856">856</a> <em class="jxr_javadoccomment">   * such that JobClient will ship them to the cluster and add them to</em>
+<a class="jxr_linenumber" name="857" href="#857">857</a> <em class="jxr_javadoccomment">   * the DistributedCache.</em>
+<a class="jxr_linenumber" name="858" href="#858">858</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="859" href="#859">859</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> addDependencyJars(Configuration conf,
+<a class="jxr_linenumber" name="860" href="#860">860</a>       Class&lt;?&gt;... classes) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="861" href="#861">861</a> 
+<a class="jxr_linenumber" name="862" href="#862">862</a>     FileSystem localFs = FileSystem.getLocal(conf);
+<a class="jxr_linenumber" name="863" href="#863">863</a>     Set&lt;String&gt; jars = <strong class="jxr_keyword">new</strong> HashSet&lt;String&gt;();
+<a class="jxr_linenumber" name="864" href="#864">864</a>     <em class="jxr_comment">// Add jars that are already in the tmpjars variable</em>
+<a class="jxr_linenumber" name="865" href="#865">865</a>     jars.addAll(conf.getStringCollection(<span class="jxr_string">"tmpjars"</span>));
+<a class="jxr_linenumber" name="866" href="#866">866</a> 
+<a class="jxr_linenumber" name="867" href="#867">867</a>     <em class="jxr_comment">// add jars as we find them to a map of contents jar name so that we can avoid</em>
+<a class="jxr_linenumber" name="868" href="#868">868</a>     <em class="jxr_comment">// creating new jars for classes that have already been packaged.</em>
+<a class="jxr_linenumber" name="869" href="#869">869</a>     Map&lt;String, String&gt; packagedClasses = <strong class="jxr_keyword">new</strong> HashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="870" href="#870">870</a> 
+<a class="jxr_linenumber" name="871" href="#871">871</a>     <em class="jxr_comment">// Add jars containing the specified classes</em>
+<a class="jxr_linenumber" name="872" href="#872">872</a>     <strong class="jxr_keyword">for</strong> (Class&lt;?&gt; clazz : classes) {
+<a class="jxr_linenumber" name="873" href="#873">873</a>       <strong class="jxr_keyword">if</strong> (clazz == <strong class="jxr_keyword">null</strong>) <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="874" href="#874">874</a> 
+<a class="jxr_linenumber" name="875" href="#875">875</a>       Path path = findOrCreateJar(clazz, localFs, packagedClasses);
+<a class="jxr_linenumber" name="876" href="#876">876</a>       <strong class="jxr_keyword">if</strong> (path == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="877" href="#877">877</a>         LOG.warn(<span class="jxr_string">"Could not find jar for class "</span> + clazz +
+<a class="jxr_linenumber" name="878" href="#878">878</a>                  <span class="jxr_string">" in order to ship it to the cluster."</span>);
+<a class="jxr_linenumber" name="879" href="#879">879</a>         <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="880" href="#880">880</a>       }
+<a class="jxr_linenumber" name="881" href="#881">881</a>       <strong class="jxr_keyword">if</strong> (!localFs.exists(path)) {
+<a class="jxr_linenumber" name="882" href="#882">882</a>         LOG.warn(<span class="jxr_string">"Could not validate jar file "</span> + path + <span class="jxr_string">" for class "</span>
+<a class="jxr_linenumber" name="883" href="#883">883</a>                  + clazz);
+<a class="jxr_linenumber" name="884" href="#884">884</a>         <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="885" href="#885">885</a>       }
+<a class="jxr_linenumber" name="886" href="#886">886</a>       jars.add(path.toString());
+<a class="jxr_linenumber" name="887" href="#887">887</a>     }
+<a class="jxr_linenumber" name="888" href="#888">888</a>     <strong class="jxr_keyword">if</strong> (jars.isEmpty()) <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="889" href="#889">889</a> 
+<a class="jxr_linenumber" name="890" href="#890">890</a>     conf.set(<span class="jxr_string">"tmpjars"</span>, StringUtils.arrayToString(jars.toArray(<strong class="jxr_keyword">new</strong> String[jars.size()])));
+<a class="jxr_linenumber" name="891" href="#891">891</a>   }
+<a class="jxr_linenumber" name="892" href="#892">892</a> 
+<a class="jxr_linenumber" name="893" href="#893">893</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="894" href="#894">894</a> <em class="jxr_javadoccomment">   * Finds the Jar for a class or creates it if it doesn't exist. If the class is in</em>
+<a class="jxr_linenumber" name="895" href="#895">895</a> <em class="jxr_javadoccomment">   * a directory in the classpath, it creates a Jar on the fly with the</em>
+<a class="jxr_linenumber" name="896" href="#896">896</a> <em class="jxr_javadoccomment">   * contents of the directory and returns the path to that Jar. If a Jar is</em>
+<a class="jxr_linenumber" name="897" href="#897">897</a> <em class="jxr_javadoccomment">   * created, it is created in the system temporary directory. Otherwise,</em>
+<a class="jxr_linenumber" name="898" href="#898">898</a> <em class="jxr_javadoccomment">   * returns an existing jar that contains a class of the same name. Maintains</em>
+<a class="jxr_linenumber" name="899" href="#899">899</a> <em class="jxr_javadoccomment">   * a mapping from jar contents to the tmp jar created.</em>
+<a class="jxr_linenumber" name="900" href="#900">900</a> <em class="jxr_javadoccomment">   * @param my_class the class to find.</em>
+<a class="jxr_linenumber" name="901" href="#901">901</a> <em class="jxr_javadoccomment">   * @param fs the FileSystem with which to qualify the returned path.</em>
+<a class="jxr_linenumber" name="902" href="#902">902</a> <em class="jxr_javadoccomment">   * @param packagedClasses a map of class name to path.</em>
+<a class="jxr_linenumber" name="903" href="#903">903</a> <em class="jxr_javadoccomment">   * @return a jar file that contains the class.</em>
+<a class="jxr_linenumber" name="904" href="#904">904</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
+<a class="jxr_linenumber" name="905" href="#905">905</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="906" href="#906">906</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Path findOrCreateJar(Class&lt;?&gt; my_<strong class="jxr_keyword">class</strong>, FileSystem fs,
+<a class="jxr_linenumber" name="907" href="#907">907</a>       Map&lt;String, String&gt; packagedClasses)
+<a class="jxr_linenumber" name="908" href="#908">908</a>   <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="909" href="#909">909</a>     <em class="jxr_comment">// attempt to locate an existing jar for the class.</em>
+<a class="jxr_linenumber" name="910" href="#910">910</a>     String jar = findContainingJar(my_<strong class="jxr_keyword">class</strong>, packagedClasses);
+<a class="jxr_linenumber" name="911" href="#911">911</a>     <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == jar || jar.isEmpty()) {
+<a class="jxr_linenumber" name="912" href="#912">912</a>       jar = getJar(my_<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="913" href="#913">913</a>       updateMap(jar, packagedClasses);
+<a class="jxr_linenumber" name="914" href="#914">914</a>     }
+<a class="jxr_linenumber" name="915" href="#915">915</a> 
+<a class="jxr_linenumber" name="916" href="#916">916</a>     <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == jar || jar.isEmpty()) {
+<a class="jxr_linenumber" name="917" href="#917">917</a>       <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="918" href="#918">918</a>     }
+<a class="jxr_linenumber" name="919" href="#919">919</a> 
+<a class="jxr_linenumber" name="920" href="#920">920</a>     LOG.debug(String.format(<span class="jxr_string">"For class %s, using jar %s"</span>, my_<strong class="jxr_keyword">class</strong>.getName(), jar));
+<a class="jxr_linenumber" name="921" href="#921">921</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> Path(jar).makeQualified(fs);
+<a class="jxr_linenumber" name="922" href="#922">922</a>   }
+<a class="jxr_linenumber" name="923" href="#923">923</a> 
+<a class="jxr_linenumber" name="924" href="#924">924</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="925" href="#925">925</a> <em class="jxr_javadoccomment">   * Add entries to &lt;code&gt;packagedClasses&lt;/code&gt; corresponding to class files</em>
+<a class="jxr_linenumber" name="926" href="#926">926</a> <em class="jxr_javadoccomment">   * contained in &lt;code&gt;jar&lt;/code&gt;.</em>
+<a class="jxr_linenumber" name="927" href="#927">927</a> <em class="jxr_javadoccomment">   * @param jar The jar who's content to list.</em>
+<a class="jxr_linenumber" name="928" href="#928">928</a> <em class="jxr_javadoccomment">   * @param packagedClasses map[class -&gt; jar]</em>
+<a class="jxr_linenumber" name="929" href="#929">929</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="930" href="#930">930</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> updateMap(String jar, Map&lt;String, String&gt; packagedClasses) <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="931" href="#931">931</a>     <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> == jar || jar.isEmpty()) {
+<a class="jxr_linenumber" name="932" href="#932">932</a>       <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="933" href="#933">933</a>     }
+<a class="jxr_linenumber" name="934" href="#934">934</a>     ZipFile zip = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="935" href="#935">935</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="936" href="#936">936</a>       zip = <strong class="jxr_keyword">new</strong> ZipFile(jar);
+<a class="jxr_linenumber" name="937" href="#937">937</a>       <strong class="jxr_keyword">for</strong> (Enumeration&lt;? <strong class="jxr_keyword">extends</strong> ZipEntry&gt; iter = zip.entries(); iter.hasMoreElements();) {
+<a class="jxr_linenumber" name="938" href="#938">938</a>         ZipEntry entry = iter.nextElement();
+<a class="jxr_linenumber" name="939" href="#939">939</a>         <strong class="jxr_keyword">if</strong> (entry.getName().endsWith(<span class="jxr_string">"class"</span>)) {
+<a class="jxr_linenumber" name="940" href="#940">940</a>           packagedClasses.put(entry.getName(), jar);
+<a class="jxr_linenumber" name="941" href="#941">941</a>         }
+<a class="jxr_linenumber" name="942" href="#942">942</a>       }
+<a class="jxr_linenumber" name="943" href="#943">943</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="944" href="#944">944</a>       <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> != zip) zip.close();
+<a class="jxr_linenumber" name="945" href="#945">945</a>     }
+<a class="jxr_linenumber" name="946" href="#946">946</a>   }
+<a class="jxr_linenumber" name="947" href="#947">947</a> 
+<a class="jxr_linenumber" name="948" href="#948">948</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="949" href="#949">949</a> <em class="jxr_javadoccomment">   * Find a jar that contains a class of the same name, if any. It will return</em>
+<a class="jxr_linenumber" name="950" href="#950">950</a> <em class="jxr_javadoccomment">   * a jar file, even if that is not the first thing on the class path that</em>
+<a class="jxr_linenumber" name="951" href="#951">951</a> <em class="jxr_javadoccomment">   * has a class with the same name. Looks first on the classpath and then in</em>
+<a class="jxr_linenumber" name="952" href="#952">952</a> <em class="jxr_javadoccomment">   * the &lt;code&gt;packagedClasses&lt;/code&gt; map.</em>
+<a class="jxr_linenumber" name="953" href="#953">953</a> <em class="jxr_javadoccomment">   * @param my_class the class to find.</em>
+<a class="jxr_linenumber" name="954" href="#954">954</a> <em class="jxr_javadoccomment">   * @return a jar file that contains the class, or null.</em>
+<a class="jxr_linenumber" name="955" href="#955">955</a> <em class="jxr_javadoccomment">   * @throws IOException</em>
+<a class="jxr_linenumber" name="956" href="#956">956</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="957" href="#957">957</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String findContainingJar(Class&lt;?&gt; my_<strong class="jxr_keyword">class</strong>, Map&lt;String, String&gt; packagedClasses)
+<a class="jxr_linenumber" name="958" href="#958">958</a>       <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="959" href="#959">959</a>     ClassLoader loader = my_<strong class="jxr_keyword">class</strong>.getClassLoader();
+<a class="jxr_linenumber" name="960" href="#960">960</a> 
+<a class="jxr_linenumber" name="961" href="#961">961</a>     String <strong class="jxr_keyword">class</strong>_file = my_<strong class="jxr_keyword">class</strong>.getName().replaceAll(<span class="jxr_string">"&#92;&#92;."</span>, <span class="jxr_string">"/"</span>) + <span class="jxr_string">".class"</span>;
+<a class="jxr_linenumber" name="962" href="#962">962</a> 
+<a class="jxr_linenumber" name="963" href="#963">963</a>     <strong class="jxr_keyword">if</strong> (loader != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="964" href="#964">964</a>       <em class="jxr_comment">// first search the classpath</em>
+<a class="jxr_linenumber" name="965" href="#965">965</a>       <strong class="jxr_keyword">for</strong> (Enumeration&lt;URL&gt; itr = loader.getResources(<strong class="jxr_keyword">class</strong>_file); itr.hasMoreElements();) {
+<a class="jxr_linenumber" name="966" href="#966">966</a>         URL url = itr.nextElement();
+<a class="jxr_linenumber" name="967" href="#967">967</a>         <strong class="jxr_keyword">if</strong> (<span class="jxr_string">"jar"</span>.equals(url.getProtocol())) {
+<a class="jxr_linenumber" name="968" href="#968">968</a>           String toReturn = url.getPath();
+<a class="jxr_linenumber" name="969" href="#969">969</a>           <strong class="jxr_keyword">if</strong> (toReturn.startsWith(<span class="jxr_string">"file:"</span>)) {
+<a class="jxr_linenumber" name="970" href="#970">970</a>             toReturn = toReturn.substring(<span class="jxr_string">"file:"</span>.length());
+<a class="jxr_linenumber" name="971" href="#971">971</a>           }
+<a class="jxr_linenumber" name="972" href="#972">972</a>           <em class="jxr_comment">// URLDecoder is a misnamed class, since it actually decodes</em>
+<a class="jxr_linenumber" name="973" href="#973">973</a>           <em class="jxr_comment">// x-www-form-urlencoded MIME type rather than actual</em>
+<a class="jxr_linenumber" name="974" href="#974">974</a>           <em class="jxr_comment">// URL encoding (which the file path has). Therefore it would</em>
+<a class="jxr_linenumber" name="975" href="#975">975</a>           <em class="jxr_comment">// decode +s to ' 's which is incorrect (spaces are actually</em>
+<a class="jxr_linenumber" name="976" href="#976">976</a>           <em class="jxr_comment">// either unencoded or encoded as "%20"). Replace +s first, so</em>
+<a class="jxr_linenumber" name="977" href="#977">977</a>           <em class="jxr_comment">// that they are kept sacred during the decoding process.</em>
+<a class="jxr_linenumber" name="978" href="#978">978</a>           toReturn = toReturn.replaceAll(<span class="jxr_string">"&#92;&#92;+"</span>, <span class="jxr_string">"%2B"</span>);
+<a class="jxr_linenumber" name="979" href="#979">979</a>           toReturn = URLDecoder.decode(toReturn, <span class="jxr_string">"UTF-8"</span>);
+<a class="jxr_linenumber" name="980" href="#980">980</a>           <strong class="jxr_keyword">return</strong> toReturn.replaceAll(<span class="jxr_string">"!.*$"</span>, <span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="981" href="#981">981</a>         }
+<a class="jxr_linenumber" name="982" href="#982">982</a>       }
+<a class="jxr_linenumber" name="983" href="#983">983</a>     }
+<a class="jxr_linenumber" name="984" href="#984">984</a> 
+<a class="jxr_linenumber" name="985" href="#985">985</a>     <em class="jxr_comment">// now look in any jars we've packaged using JarFinder. Returns null when</em>
+<a class="jxr_linenumber" name="986" href="#986">986</a>     <em class="jxr_comment">// no jar is found.</em>
+<a class="jxr_linenumber" name="987" href="#987">987</a>     <strong class="jxr_keyword">return</strong> packagedClasses.get(<strong class="jxr_keyword">class</strong>_file);
+<a class="jxr_linenumber" name="988" href="#988">988</a>   }
 <a class="jxr_linenumber" name="989" href="#989">989</a> 
-<a class="jxr_linenumber" name="990" href="#990">990</a>     <strong class="jxr_keyword">return</strong> ret;
-<a class="jxr_linenumber" name="991" href="#991">991</a>   }
-<a class="jxr_linenumber" name="992" href="#992">992</a> }
+<a class="jxr_linenumber" name="990" href="#990">990</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="991" href="#991">991</a> <em class="jxr_javadoccomment">   * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job</em>
+<a class="jxr_linenumber" name="992" href="#992">992</a> <em class="jxr_javadoccomment">   * configuration contexts (HBASE-8140) and also for testing on MRv2.</em>
+<a class="jxr_linenumber" name="993" href="#993">993</a> <em class="jxr_javadoccomment">   * check if we have HADOOP-9426.</em>
+<a class="jxr_linenumber" name="994" href="#994">994</a> <em class="jxr_javadoccomment">   * @param my_class the class to find.</em>
+<a class="jxr_linenumber" name="995" href="#995">995</a> <em class="jxr_javadoccomment">   * @return a jar file that contains the class, or null.</em>
+<a class="jxr_linenumber" name="996" href="#996">996</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="997" href="#997">997</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getJar(Class&lt;?&gt; my_<strong class="jxr_keyword">class</strong>) {
+<a class="jxr_linenumber" name="998" href="#998">998</a>     String ret = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="999" href="#999">999</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="1000" href="#1000">1000</a>       ret = JarFinder.getJar(my_<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="1001" href="#1001">1001</a>     } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="1002" href="#1002">1002</a>       <em class="jxr_comment">// toss all other exceptions, related to reflection failure</em>
+<a class="jxr_linenumber" name="1003" href="#1003">1003</a>       <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> RuntimeException(<span class="jxr_string">"getJar invocation failed."</span>, e);
+<a class="jxr_linenumber" name="1004" href="#1004">1004</a>     }
+<a class="jxr_linenumber" name="1005" href="#1005">1005</a> 
+<a class="jxr_linenumber" name="1006" href="#1006">1006</a>     <strong class="jxr_keyword">return</strong> ret;
+<a class="jxr_linenumber" name="1007" href="#1007">1007</a>   }
+<a class="jxr_linenumber" name="1008" href="#1008">1008</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/regionserver/StoreScanner.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/xref/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index e35c016..4039782 100644
--- a/xref/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/xref/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -74,7 +74,7 @@
 <a class="jxr_linenumber" name="64" href="#64">64</a>    <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValueHeap.html">KeyValueHeap</a> heap;
 <a class="jxr_linenumber" name="65" href="#65">65</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> cacheBlocks;
 <a class="jxr_linenumber" name="66" href="#66">66</a>  
-<a class="jxr_linenumber" name="67" href="#67">67</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong> countPerRow = 0;
+<a class="jxr_linenumber" name="67" href="#67">67</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">long</strong> countPerRow = 0;
 <a class="jxr_linenumber" name="68" href="#68">68</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong> storeLimit = -1;
 <a class="jxr_linenumber" name="69" href="#69">69</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">int</strong> storeOffset = 0;
 <a class="jxr_linenumber" name="70" href="#70">70</a>  

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html b/xref/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
index 2c381b8..76304cf 100644
--- a/xref/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
+++ b/xref/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
@@ -295,79 +295,80 @@
 <a class="jxr_linenumber" name="285" href="#285">285</a>     }
 <a class="jxr_linenumber" name="286" href="#286">286</a>   }
 <a class="jxr_linenumber" name="287" href="#287">287</a> 
-<a class="jxr_linenumber" name="288" href="#288">288</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> SecretKey createSecretKey(byte[] raw) {
-<a class="jxr_linenumber" name="289" href="#289">289</a>     <strong class="jxr_keyword">return</strong> SecretManager.createSecretKey(raw);
+<a class="jxr_linenumber" name="288" href="#288">288</a>   <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">long</strong> getLastKeyUpdate() {
+<a class="jxr_linenumber" name="289" href="#289">289</a>     <strong class="jxr_keyword">return</strong> lastKeyUpdate;
 <a class="jxr_linenumber" name="290" href="#290">290</a>   }
 <a class="jxr_linenumber" name="291" href="#291">291</a> 
-<a class="jxr_linenumber" name="292" href="#292">292</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html">LeaderElector</a> <strong class="jxr_keyword">extends</strong> Thread <strong class="jxr_keyword">implements</strong> <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html">Stoppable</a> {
-<a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> stopped = false;
-<a class="jxr_linenumber" name="294" href="#294">294</a>     <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Flag indicating whether we're in charge of rolling/expiring keys */</em>
-<a class="jxr_linenumber" name="295" href="#295">295</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isMaster = false;
-<a class="jxr_linenumber" name="296" href="#296">296</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html">ZKLeaderManager</a> zkLeader;
-<a class="jxr_linenumber" name="297" href="#297">297</a> 
-<a class="jxr_linenumber" name="298" href="#298">298</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html">LeaderElector</a>(<a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html">ZooKeeperWatcher</a> watcher, String serverName) {
-<a class="jxr_linenumber" name="299" href="#299">299</a>       setDaemon(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="300" href="#300">300</a>       setName(<span class="jxr_string">"ZKSecretWatcher-leaderElector"</span>);
-<a class="jxr_linenumber" name="301" href="#301">301</a>       zkLeader = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html">ZKLeaderManager</a>(watcher,
-<a class="jxr_linenumber" name="302" href="#302">302</a>           ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), <span class="jxr_string">"keymaster"</span>),
-<a class="jxr_linenumber" name="303" href="#303">303</a>           Bytes.toBytes(serverName), <strong class="jxr_keyword">this</strong>);
-<a class="jxr_linenumber" name="304" href="#304">304</a>     }
-<a class="jxr_linenumber" name="305" href="#305">305</a> 
-<a class="jxr_linenumber" name="306" href="#306">306</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isMaster() {
-<a class="jxr_linenumber" name="307" href="#307">307</a>       <strong class="jxr_keyword">return</strong> isMaster;
+<a class="jxr_linenumber" name="292" href="#292">292</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> SecretKey createSecretKey(byte[] raw) {
+<a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">return</strong> SecretManager.createSecretKey(raw);
+<a class="jxr_linenumber" name="294" href="#294">294</a>   }
+<a class="jxr_linenumber" name="295" href="#295">295</a> 
+<a class="jxr_linenumber" name="296" href="#296">296</a>   <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html">LeaderElector</a> <strong class="jxr_keyword">extends</strong> Thread <strong class="jxr_keyword">implements</strong> <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html">Stoppable</a> {
+<a class="jxr_linenumber" name="297" href="#297">297</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> stopped = false;
+<a class="jxr_linenumber" name="298" href="#298">298</a>     <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> Flag indicating whether we're in charge of rolling/expiring keys */</em>
+<a class="jxr_linenumber" name="299" href="#299">299</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> isMaster = false;
+<a class="jxr_linenumber" name="300" href="#300">300</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html">ZKLeaderManager</a> zkLeader;
+<a class="jxr_linenumber" name="301" href="#301">301</a> 
+<a class="jxr_linenumber" name="302" href="#302">302</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html">LeaderElector</a>(<a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html">ZooKeeperWatcher</a> watcher, String serverName) {
+<a class="jxr_linenumber" name="303" href="#303">303</a>       setDaemon(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="304" href="#304">304</a>       setName(<span class="jxr_string">"ZKSecretWatcher-leaderElector"</span>);
+<a class="jxr_linenumber" name="305" href="#305">305</a>       zkLeader = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html">ZKLeaderManager</a>(watcher,
+<a class="jxr_linenumber" name="306" href="#306">306</a>           ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), <span class="jxr_string">"keymaster"</span>),
+<a class="jxr_linenumber" name="307" href="#307">307</a>           Bytes.toBytes(serverName), <strong class="jxr_keyword">this</strong>);
 <a class="jxr_linenumber" name="308" href="#308">308</a>     }
 <a class="jxr_linenumber" name="309" href="#309">309</a> 
-<a class="jxr_linenumber" name="310" href="#310">310</a>     @Override
-<a class="jxr_linenumber" name="311" href="#311">311</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isStopped() {
-<a class="jxr_linenumber" name="312" href="#312">312</a>       <strong class="jxr_keyword">return</strong> stopped;
-<a class="jxr_linenumber" name="313" href="#313">313</a>     }
-<a class="jxr_linenumber" name="314" href="#314">314</a> 
-<a class="jxr_linenumber" name="315" href="#315">315</a>     @Override
-<a class="jxr_linenumber" name="316" href="#316">316</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> stop(String reason) {
-<a class="jxr_linenumber" name="317" href="#317">317</a>       <strong class="jxr_keyword">if</strong> (stopped) {
-<a class="jxr_linenumber" name="318" href="#318">318</a>         <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="319" href="#319">319</a>       }
-<a class="jxr_linenumber" name="320" href="#320">320</a> 
-<a class="jxr_linenumber" name="321" href="#321">321</a>       stopped = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="322" href="#322">322</a>       <em class="jxr_comment">// prevent further key generation when stopping</em>
-<a class="jxr_linenumber" name="323" href="#323">323</a>       <strong class="jxr_keyword">if</strong> (isMaster) {
-<a class="jxr_linenumber" name="324" href="#324">324</a>         zkLeader.stepDownAsLeader();
-<a class="jxr_linenumber" name="325" href="#325">325</a>       }
-<a class="jxr_linenumber" name="326" href="#326">326</a>       isMaster = false;
-<a class="jxr_linenumber" name="327" href="#327">327</a>       LOG.info(<span class="jxr_string">"Stopping leader election, because: "</span>+reason);
-<a class="jxr_linenumber" name="328" href="#328">328</a>       interrupt();
-<a class="jxr_linenumber" name="329" href="#329">329</a>     }
-<a class="jxr_linenumber" name="330" href="#330">330</a> 
-<a class="jxr_linenumber" name="331" href="#331">331</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
-<a class="jxr_linenumber" name="332" href="#332">332</a>       zkLeader.start();
-<a class="jxr_linenumber" name="333" href="#333">333</a>       zkLeader.waitToBecomeLeader();
-<a class="jxr_linenumber" name="334" href="#334">334</a>       isMaster = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="335" href="#335">335</a> 
-<a class="jxr_linenumber" name="336" href="#336">336</a>       <strong class="jxr_keyword">while</strong> (!stopped) {
-<a class="jxr_linenumber" name="337" href="#337">337</a>         <strong class="jxr_keyword">long</strong> now = EnvironmentEdgeManager.currentTime();
-<a class="jxr_linenumber" name="338" href="#338">338</a> 
-<a class="jxr_linenumber" name="339" href="#339">339</a>         <em class="jxr_comment">// clear any expired</em>
-<a class="jxr_linenumber" name="340" href="#340">340</a>         removeExpiredKeys();
-<a class="jxr_linenumber" name="341" href="#341">341</a>         <strong class="jxr_keyword">long</strong> localLastKeyUpdate;
-<a class="jxr_linenumber" name="342" href="#342">342</a>         <strong class="jxr_keyword">synchronized</strong> (<strong class="jxr_keyword">this</strong>) {
-<a class="jxr_linenumber" name="343" href="#343">343</a>           localLastKeyUpdate = lastKeyUpdate;
-<a class="jxr_linenumber" name="344" href="#344">344</a>         }
-<a class="jxr_linenumber" name="345" href="#345">345</a>         <strong class="jxr_keyword">if</strong> (localLastKeyUpdate + keyUpdateInterval &lt; now) {
-<a class="jxr_linenumber" name="346" href="#346">346</a>           <em class="jxr_comment">// roll a new master key</em>
-<a class="jxr_linenumber" name="347" href="#347">347</a>           rollCurrentKey();
-<a class="jxr_linenumber" name="348" href="#348">348</a>         }
-<a class="jxr_linenumber" name="349" href="#349">349</a> 
-<a class="jxr_linenumber" name="350" href="#350">350</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="351" href="#351">351</a>           Thread.sleep(5000);
-<a class="jxr_linenumber" name="352" href="#352">352</a>         } <strong class="jxr_keyword">catch</strong> (InterruptedException ie) {
-<a class="jxr_linenumber" name="353" href="#353">353</a>           <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a class="jxr_linenumber" name="354" href="#354">354</a>             LOG.debug(<span class="jxr_string">"Interrupted waiting for next update"</span>, ie);
-<a class="jxr_linenumber" name="355" href="#355">355</a>           }
-<a class="jxr_linenumber" name="356" href="#356">356</a>         }
-<a class="jxr_linenumber" name="357" href="#357">357</a>       }
-<a class="jxr_linenumber" name="358" href="#358">358</a>     }
-<a class="jxr_linenumber" name="359" href="#359">359</a>   }
-<a class="jxr_linenumber" name="360" href="#360">360</a> }
+<a class="jxr_linenumber" name="310" href="#310">310</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isMaster() {
+<a class="jxr_linenumber" name="311" href="#311">311</a>       <strong class="jxr_keyword">return</strong> isMaster;
+<a class="jxr_linenumber" name="312" href="#312">312</a>     }
+<a class="jxr_linenumber" name="313" href="#313">313</a> 
+<a class="jxr_linenumber" name="314" href="#314">314</a>     @Override
+<a class="jxr_linenumber" name="315" href="#315">315</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isStopped() {
+<a class="jxr_linenumber" name="316" href="#316">316</a>       <strong class="jxr_keyword">return</strong> stopped;
+<a class="jxr_linenumber" name="317" href="#317">317</a>     }
+<a class="jxr_linenumber" name="318" href="#318">318</a> 
+<a class="jxr_linenumber" name="319" href="#319">319</a>     @Override
+<a class="jxr_linenumber" name="320" href="#320">320</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> stop(String reason) {
+<a class="jxr_linenumber" name="321" href="#321">321</a>       <strong class="jxr_keyword">if</strong> (stopped) {
+<a class="jxr_linenumber" name="322" href="#322">322</a>         <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="323" href="#323">323</a>       }
+<a class="jxr_linenumber" name="324" href="#324">324</a> 
+<a class="jxr_linenumber" name="325" href="#325">325</a>       stopped = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="326" href="#326">326</a>       <em class="jxr_comment">// prevent further key generation when stopping</em>
+<a class="jxr_linenumber" name="327" href="#327">327</a>       <strong class="jxr_keyword">if</strong> (isMaster) {
+<a class="jxr_linenumber" name="328" href="#328">328</a>         zkLeader.stepDownAsLeader();
+<a class="jxr_linenumber" name="329" href="#329">329</a>       }
+<a class="jxr_linenumber" name="330" href="#330">330</a>       isMaster = false;
+<a class="jxr_linenumber" name="331" href="#331">331</a>       LOG.info(<span class="jxr_string">"Stopping leader election, because: "</span>+reason);
+<a class="jxr_linenumber" name="332" href="#332">332</a>       interrupt();
+<a class="jxr_linenumber" name="333" href="#333">333</a>     }
+<a class="jxr_linenumber" name="334" href="#334">334</a> 
+<a class="jxr_linenumber" name="335" href="#335">335</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> run() {
+<a class="jxr_linenumber" name="336" href="#336">336</a>       zkLeader.start();
+<a class="jxr_linenumber" name="337" href="#337">337</a>       zkLeader.waitToBecomeLeader();
+<a class="jxr_linenumber" name="338" href="#338">338</a>       isMaster = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="339" href="#339">339</a> 
+<a class="jxr_linenumber" name="340" href="#340">340</a>       <strong class="jxr_keyword">while</strong> (!stopped) {
+<a class="jxr_linenumber" name="341" href="#341">341</a>         <strong class="jxr_keyword">long</strong> now = EnvironmentEdgeManager.currentTime();
+<a class="jxr_linenumber" name="342" href="#342">342</a> 
+<a class="jxr_linenumber" name="343" href="#343">343</a>         <em class="jxr_comment">// clear any expired</em>
+<a class="jxr_linenumber" name="344" href="#344">344</a>         removeExpiredKeys();
+<a class="jxr_linenumber" name="345" href="#345">345</a>         <strong class="jxr_keyword">long</strong> localLastKeyUpdate = getLastKeyUpdate();
+<a class="jxr_linenumber" name="346" href="#346">346</a>         <strong class="jxr_keyword">if</strong> (localLastKeyUpdate + keyUpdateInterval &lt; now) {
+<a class="jxr_linenumber" name="347" href="#347">347</a>           <em class="jxr_comment">// roll a new master key</em>
+<a class="jxr_linenumber" name="348" href="#348">348</a>           rollCurrentKey();
+<a class="jxr_linenumber" name="349" href="#349">349</a>         }
+<a class="jxr_linenumber" name="350" href="#350">350</a> 
+<a class="jxr_linenumber" name="351" href="#351">351</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="352" href="#352">352</a>           Thread.sleep(5000);
+<a class="jxr_linenumber" name="353" href="#353">353</a>         } <strong class="jxr_keyword">catch</strong> (InterruptedException ie) {
+<a class="jxr_linenumber" name="354" href="#354">354</a>           <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a class="jxr_linenumber" name="355" href="#355">355</a>             LOG.debug(<span class="jxr_string">"Interrupted waiting for next update"</span>, ie);
+<a class="jxr_linenumber" name="356" href="#356">356</a>           }
+<a class="jxr_linenumber" name="357" href="#357">357</a>         }
+<a class="jxr_linenumber" name="358" href="#358">358</a>       }
+<a class="jxr_linenumber" name="359" href="#359">359</a>     }
+<a class="jxr_linenumber" name="360" href="#360">360</a>   }
+<a class="jxr_linenumber" name="361" href="#361">361</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>


[09/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index 6e0c552..8564223 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -67,15 +67,15 @@
 <span class="sourceLineNo">059</span>  requiredArguments = {<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;")})<a name="line.70"></a>
+<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
 <span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
 <span class="sourceLineNo">072</span>  extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
 <span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,159 +116,159 @@
 <span class="sourceLineNo">108</span>      return m_master;<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    }<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    // 24, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.112"></a>
+<span class="sourceLineNo">111</span>    // 26, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    public void setFilter(String filter)<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // 24, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      m_deadServers = deadServers;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      m_deadServers__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span>      // 26, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      m_filter = filter;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      m_filter__IsNotDefault = true;<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.118"></a>
+<span class="sourceLineNo">118</span>    public String getFilter()<a name="line.118"></a>
 <span class="sourceLineNo">119</span>    {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return m_deadServers;<a name="line.120"></a>
+<span class="sourceLineNo">120</span>      return m_filter;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    public boolean getDeadServers__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span>    private String m_filter;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    public boolean getFilter__IsNotDefault()<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return m_deadServers__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>      return m_filter__IsNotDefault;<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    private boolean m_deadServers__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // 22, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.129"></a>
+<span class="sourceLineNo">127</span>    private boolean m_filter__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // 27, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    public void setFormat(String format)<a name="line.129"></a>
 <span class="sourceLineNo">130</span>    {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // 22, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      m_metaLocation = metaLocation;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      m_metaLocation__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span>      // 27, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      m_format = format;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      m_format__IsNotDefault = true;<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public ServerName getMetaLocation()<a name="line.135"></a>
+<span class="sourceLineNo">135</span>    public String getFormat()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_metaLocation;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_format;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private ServerName m_metaLocation;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span>    private String m_format;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    public boolean getFormat__IsNotDefault()<a name="line.140"></a>
 <span class="sourceLineNo">141</span>    {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return m_metaLocation__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span>      return m_format__IsNotDefault;<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // 26, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    public void setFilter(String filter)<a name="line.146"></a>
+<span class="sourceLineNo">144</span>    private boolean m_format__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    // 29, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // 26, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      m_filter = filter;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      m_filter__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span>      // 29, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      m_assignmentManager = assignmentManager;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      m_assignmentManager__IsNotDefault = true;<a name="line.150"></a>
 <span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    public String getFilter()<a name="line.152"></a>
+<span class="sourceLineNo">152</span>    public AssignmentManager getAssignmentManager()<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return m_filter;<a name="line.154"></a>
+<span class="sourceLineNo">154</span>      return m_assignmentManager;<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    private String m_filter;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    public boolean getFilter__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span>    private AssignmentManager m_assignmentManager;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return m_filter__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span>      return m_assignmentManager__IsNotDefault;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private boolean m_filter__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    // 25, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.163"></a>
+<span class="sourceLineNo">161</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // 23, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      // 25, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span>      // 23, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      m_servers = servers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      m_servers__IsNotDefault = true;<a name="line.167"></a>
 <span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public boolean getCatalogJanitorEnabled()<a name="line.169"></a>
+<span class="sourceLineNo">169</span>    public List&lt;ServerName&gt; getServers()<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return m_catalogJanitorEnabled;<a name="line.171"></a>
+<span class="sourceLineNo">171</span>      return m_servers;<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    private boolean m_catalogJanitorEnabled;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span>    private List&lt;ServerName&gt; m_servers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    public boolean getServers__IsNotDefault()<a name="line.174"></a>
 <span class="sourceLineNo">175</span>    {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span>      return m_servers__IsNotDefault;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    // 21, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.180"></a>
+<span class="sourceLineNo">178</span>    private boolean m_servers__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    // 24, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.180"></a>
 <span class="sourceLineNo">181</span>    {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      // 21, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      m_frags = frags;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      m_frags__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span>      // 24, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      m_deadServers = deadServers;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      m_deadServers__IsNotDefault = true;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.186"></a>
+<span class="sourceLineNo">186</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return m_frags;<a name="line.188"></a>
+<span class="sourceLineNo">188</span>      return m_deadServers;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    public boolean getFrags__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean getDeadServers__IsNotDefault()<a name="line.191"></a>
 <span class="sourceLineNo">192</span>    {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return m_frags__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span>      return m_deadServers__IsNotDefault;<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    private boolean m_frags__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    // 27, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    public void setFormat(String format)<a name="line.197"></a>
+<span class="sourceLineNo">195</span>    private boolean m_deadServers__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    // 21, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      // 27, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      m_format = format;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      m_format__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span>      // 21, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      m_frags = frags;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      m_frags__IsNotDefault = true;<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    public String getFormat()<a name="line.203"></a>
+<span class="sourceLineNo">203</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.203"></a>
 <span class="sourceLineNo">204</span>    {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return m_format;<a name="line.205"></a>
+<span class="sourceLineNo">205</span>      return m_frags;<a name="line.205"></a>
 <span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    private String m_format;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public boolean getFormat__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    public boolean getFrags__IsNotDefault()<a name="line.208"></a>
 <span class="sourceLineNo">209</span>    {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      return m_format__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span>      return m_frags__IsNotDefault;<a name="line.210"></a>
 <span class="sourceLineNo">211</span>    }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    private boolean m_format__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // 29, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
+<span class="sourceLineNo">212</span>    private boolean m_frags__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    // 28, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    public void setServerManager(ServerManager serverManager)<a name="line.214"></a>
 <span class="sourceLineNo">215</span>    {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      // 29, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      m_assignmentManager = assignmentManager;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span>      // 28, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      m_serverManager = serverManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      m_serverManager__IsNotDefault = true;<a name="line.218"></a>
 <span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    public AssignmentManager getAssignmentManager()<a name="line.220"></a>
+<span class="sourceLineNo">220</span>    public ServerManager getServerManager()<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return m_assignmentManager;<a name="line.222"></a>
+<span class="sourceLineNo">222</span>      return m_serverManager;<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    private AssignmentManager m_assignmentManager;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span>    private ServerManager m_serverManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    public boolean getServerManager__IsNotDefault()<a name="line.225"></a>
 <span class="sourceLineNo">226</span>    {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span>      return m_serverManager__IsNotDefault;<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // 28, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    public void setServerManager(ServerManager serverManager)<a name="line.231"></a>
+<span class="sourceLineNo">229</span>    private boolean m_serverManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    // 25, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      // 28, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      m_serverManager = serverManager;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      m_serverManager__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span>      // 25, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    public ServerManager getServerManager()<a name="line.237"></a>
+<span class="sourceLineNo">237</span>    public boolean getCatalogJanitorEnabled()<a name="line.237"></a>
 <span class="sourceLineNo">238</span>    {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return m_serverManager;<a name="line.239"></a>
+<span class="sourceLineNo">239</span>      return m_catalogJanitorEnabled;<a name="line.239"></a>
 <span class="sourceLineNo">240</span>    }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    private ServerManager m_serverManager;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    public boolean getServerManager__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span>    private boolean m_catalogJanitorEnabled;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.242"></a>
 <span class="sourceLineNo">243</span>    {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return m_serverManager__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.244"></a>
 <span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    private boolean m_serverManager__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // 23, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.248"></a>
+<span class="sourceLineNo">246</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // 22, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
 <span class="sourceLineNo">249</span>    {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      // 23, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      m_servers = servers;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      m_servers__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span>      // 22, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      m_metaLocation = metaLocation;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
 <span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    public List&lt;ServerName&gt; getServers()<a name="line.254"></a>
+<span class="sourceLineNo">254</span>    public ServerName getMetaLocation()<a name="line.254"></a>
 <span class="sourceLineNo">255</span>    {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return m_servers;<a name="line.256"></a>
+<span class="sourceLineNo">256</span>      return m_metaLocation;<a name="line.256"></a>
 <span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    private List&lt;ServerName&gt; m_servers;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public boolean getServers__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span>    private ServerName m_metaLocation;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
 <span class="sourceLineNo">260</span>    {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      return m_servers__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span>      return m_metaLocation__IsNotDefault;<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    private boolean m_servers__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.263"></a>
 <span class="sourceLineNo">264</span>  }<a name="line.264"></a>
 <span class="sourceLineNo">265</span>  @Override<a name="line.265"></a>
 <span class="sourceLineNo">266</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,66 +280,66 @@
 <span class="sourceLineNo">272</span>    return (ImplData) super.getImplData();<a name="line.272"></a>
 <span class="sourceLineNo">273</span>  }<a name="line.273"></a>
 <span class="sourceLineNo">274</span>  <a name="line.274"></a>
-<span class="sourceLineNo">275</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.276"></a>
+<span class="sourceLineNo">275</span>  protected String filter;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.276"></a>
 <span class="sourceLineNo">277</span>  {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.278"></a>
+<span class="sourceLineNo">278</span>    (getImplData()).setFilter(p_filter);<a name="line.278"></a>
 <span class="sourceLineNo">279</span>    return this;<a name="line.279"></a>
 <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>  protected ServerName metaLocation;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.283"></a>
+<span class="sourceLineNo">282</span>  protected String format;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.283"></a>
 <span class="sourceLineNo">284</span>  {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.285"></a>
+<span class="sourceLineNo">285</span>    (getImplData()).setFormat(p_format);<a name="line.285"></a>
 <span class="sourceLineNo">286</span>    return this;<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>  protected String filter;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.290"></a>
+<span class="sourceLineNo">289</span>  protected AssignmentManager assignmentManager;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.290"></a>
 <span class="sourceLineNo">291</span>  {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    (getImplData()).setFilter(p_filter);<a name="line.292"></a>
+<span class="sourceLineNo">292</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.292"></a>
 <span class="sourceLineNo">293</span>    return this;<a name="line.293"></a>
 <span class="sourceLineNo">294</span>  }<a name="line.294"></a>
 <span class="sourceLineNo">295</span>  <a name="line.295"></a>
-<span class="sourceLineNo">296</span>  protected boolean catalogJanitorEnabled;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.297"></a>
+<span class="sourceLineNo">296</span>  protected List&lt;ServerName&gt; servers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.297"></a>
 <span class="sourceLineNo">298</span>  {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.299"></a>
+<span class="sourceLineNo">299</span>    (getImplData()).setServers(p_servers);<a name="line.299"></a>
 <span class="sourceLineNo">300</span>    return this;<a name="line.300"></a>
 <span class="sourceLineNo">301</span>  }<a name="line.301"></a>
 <span class="sourceLineNo">302</span>  <a name="line.302"></a>
-<span class="sourceLineNo">303</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.304"></a>
+<span class="sourceLineNo">303</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.304"></a>
 <span class="sourceLineNo">305</span>  {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    (getImplData()).setFrags(p_frags);<a name="line.306"></a>
+<span class="sourceLineNo">306</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.306"></a>
 <span class="sourceLineNo">307</span>    return this;<a name="line.307"></a>
 <span class="sourceLineNo">308</span>  }<a name="line.308"></a>
 <span class="sourceLineNo">309</span>  <a name="line.309"></a>
-<span class="sourceLineNo">310</span>  protected String format;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.311"></a>
+<span class="sourceLineNo">310</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.311"></a>
 <span class="sourceLineNo">312</span>  {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    (getImplData()).setFormat(p_format);<a name="line.313"></a>
+<span class="sourceLineNo">313</span>    (getImplData()).setFrags(p_frags);<a name="line.313"></a>
 <span class="sourceLineNo">314</span>    return this;<a name="line.314"></a>
 <span class="sourceLineNo">315</span>  }<a name="line.315"></a>
 <span class="sourceLineNo">316</span>  <a name="line.316"></a>
-<span class="sourceLineNo">317</span>  protected AssignmentManager assignmentManager;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
+<span class="sourceLineNo">317</span>  protected ServerManager serverManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.318"></a>
 <span class="sourceLineNo">319</span>  {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
+<span class="sourceLineNo">320</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.320"></a>
 <span class="sourceLineNo">321</span>    return this;<a name="line.321"></a>
 <span class="sourceLineNo">322</span>  }<a name="line.322"></a>
 <span class="sourceLineNo">323</span>  <a name="line.323"></a>
-<span class="sourceLineNo">324</span>  protected ServerManager serverManager;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.325"></a>
+<span class="sourceLineNo">324</span>  protected boolean catalogJanitorEnabled;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.325"></a>
 <span class="sourceLineNo">326</span>  {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>    return this;<a name="line.328"></a>
 <span class="sourceLineNo">329</span>  }<a name="line.329"></a>
 <span class="sourceLineNo">330</span>  <a name="line.330"></a>
-<span class="sourceLineNo">331</span>  protected List&lt;ServerName&gt; servers;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.332"></a>
+<span class="sourceLineNo">331</span>  protected ServerName metaLocation;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
 <span class="sourceLineNo">333</span>  {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    (getImplData()).setServers(p_servers);<a name="line.334"></a>
+<span class="sourceLineNo">334</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
 <span class="sourceLineNo">335</span>    return this;<a name="line.335"></a>
 <span class="sourceLineNo">336</span>  }<a name="line.336"></a>
 <span class="sourceLineNo">337</span>  <a name="line.337"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
index 6e0c552..8564223 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.Intf.html
@@ -67,15 +67,15 @@
 <span class="sourceLineNo">059</span>  requiredArguments = {<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;")})<a name="line.70"></a>
+<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
 <span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
 <span class="sourceLineNo">072</span>  extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
 <span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,159 +116,159 @@
 <span class="sourceLineNo">108</span>      return m_master;<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    }<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    // 24, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.112"></a>
+<span class="sourceLineNo">111</span>    // 26, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    public void setFilter(String filter)<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // 24, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      m_deadServers = deadServers;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      m_deadServers__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span>      // 26, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      m_filter = filter;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      m_filter__IsNotDefault = true;<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.118"></a>
+<span class="sourceLineNo">118</span>    public String getFilter()<a name="line.118"></a>
 <span class="sourceLineNo">119</span>    {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return m_deadServers;<a name="line.120"></a>
+<span class="sourceLineNo">120</span>      return m_filter;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    public boolean getDeadServers__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span>    private String m_filter;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    public boolean getFilter__IsNotDefault()<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return m_deadServers__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>      return m_filter__IsNotDefault;<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    private boolean m_deadServers__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // 22, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.129"></a>
+<span class="sourceLineNo">127</span>    private boolean m_filter__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // 27, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    public void setFormat(String format)<a name="line.129"></a>
 <span class="sourceLineNo">130</span>    {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // 22, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      m_metaLocation = metaLocation;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      m_metaLocation__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span>      // 27, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      m_format = format;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      m_format__IsNotDefault = true;<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public ServerName getMetaLocation()<a name="line.135"></a>
+<span class="sourceLineNo">135</span>    public String getFormat()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_metaLocation;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_format;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private ServerName m_metaLocation;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span>    private String m_format;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    public boolean getFormat__IsNotDefault()<a name="line.140"></a>
 <span class="sourceLineNo">141</span>    {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return m_metaLocation__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span>      return m_format__IsNotDefault;<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // 26, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    public void setFilter(String filter)<a name="line.146"></a>
+<span class="sourceLineNo">144</span>    private boolean m_format__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    // 29, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // 26, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      m_filter = filter;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      m_filter__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span>      // 29, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      m_assignmentManager = assignmentManager;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      m_assignmentManager__IsNotDefault = true;<a name="line.150"></a>
 <span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    public String getFilter()<a name="line.152"></a>
+<span class="sourceLineNo">152</span>    public AssignmentManager getAssignmentManager()<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return m_filter;<a name="line.154"></a>
+<span class="sourceLineNo">154</span>      return m_assignmentManager;<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    private String m_filter;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    public boolean getFilter__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span>    private AssignmentManager m_assignmentManager;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return m_filter__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span>      return m_assignmentManager__IsNotDefault;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private boolean m_filter__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    // 25, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.163"></a>
+<span class="sourceLineNo">161</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // 23, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      // 25, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span>      // 23, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      m_servers = servers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      m_servers__IsNotDefault = true;<a name="line.167"></a>
 <span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public boolean getCatalogJanitorEnabled()<a name="line.169"></a>
+<span class="sourceLineNo">169</span>    public List&lt;ServerName&gt; getServers()<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return m_catalogJanitorEnabled;<a name="line.171"></a>
+<span class="sourceLineNo">171</span>      return m_servers;<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    private boolean m_catalogJanitorEnabled;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span>    private List&lt;ServerName&gt; m_servers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    public boolean getServers__IsNotDefault()<a name="line.174"></a>
 <span class="sourceLineNo">175</span>    {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span>      return m_servers__IsNotDefault;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    // 21, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.180"></a>
+<span class="sourceLineNo">178</span>    private boolean m_servers__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    // 24, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.180"></a>
 <span class="sourceLineNo">181</span>    {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      // 21, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      m_frags = frags;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      m_frags__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span>      // 24, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      m_deadServers = deadServers;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      m_deadServers__IsNotDefault = true;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.186"></a>
+<span class="sourceLineNo">186</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return m_frags;<a name="line.188"></a>
+<span class="sourceLineNo">188</span>      return m_deadServers;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    public boolean getFrags__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean getDeadServers__IsNotDefault()<a name="line.191"></a>
 <span class="sourceLineNo">192</span>    {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return m_frags__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span>      return m_deadServers__IsNotDefault;<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    private boolean m_frags__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    // 27, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    public void setFormat(String format)<a name="line.197"></a>
+<span class="sourceLineNo">195</span>    private boolean m_deadServers__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    // 21, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      // 27, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      m_format = format;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      m_format__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span>      // 21, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      m_frags = frags;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      m_frags__IsNotDefault = true;<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    public String getFormat()<a name="line.203"></a>
+<span class="sourceLineNo">203</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.203"></a>
 <span class="sourceLineNo">204</span>    {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return m_format;<a name="line.205"></a>
+<span class="sourceLineNo">205</span>      return m_frags;<a name="line.205"></a>
 <span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    private String m_format;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public boolean getFormat__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    public boolean getFrags__IsNotDefault()<a name="line.208"></a>
 <span class="sourceLineNo">209</span>    {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      return m_format__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span>      return m_frags__IsNotDefault;<a name="line.210"></a>
 <span class="sourceLineNo">211</span>    }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    private boolean m_format__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // 29, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
+<span class="sourceLineNo">212</span>    private boolean m_frags__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    // 28, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    public void setServerManager(ServerManager serverManager)<a name="line.214"></a>
 <span class="sourceLineNo">215</span>    {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      // 29, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      m_assignmentManager = assignmentManager;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span>      // 28, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      m_serverManager = serverManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      m_serverManager__IsNotDefault = true;<a name="line.218"></a>
 <span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    public AssignmentManager getAssignmentManager()<a name="line.220"></a>
+<span class="sourceLineNo">220</span>    public ServerManager getServerManager()<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return m_assignmentManager;<a name="line.222"></a>
+<span class="sourceLineNo">222</span>      return m_serverManager;<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    private AssignmentManager m_assignmentManager;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span>    private ServerManager m_serverManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    public boolean getServerManager__IsNotDefault()<a name="line.225"></a>
 <span class="sourceLineNo">226</span>    {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span>      return m_serverManager__IsNotDefault;<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // 28, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    public void setServerManager(ServerManager serverManager)<a name="line.231"></a>
+<span class="sourceLineNo">229</span>    private boolean m_serverManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    // 25, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      // 28, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      m_serverManager = serverManager;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      m_serverManager__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span>      // 25, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    public ServerManager getServerManager()<a name="line.237"></a>
+<span class="sourceLineNo">237</span>    public boolean getCatalogJanitorEnabled()<a name="line.237"></a>
 <span class="sourceLineNo">238</span>    {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return m_serverManager;<a name="line.239"></a>
+<span class="sourceLineNo">239</span>      return m_catalogJanitorEnabled;<a name="line.239"></a>
 <span class="sourceLineNo">240</span>    }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    private ServerManager m_serverManager;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    public boolean getServerManager__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span>    private boolean m_catalogJanitorEnabled;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.242"></a>
 <span class="sourceLineNo">243</span>    {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return m_serverManager__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.244"></a>
 <span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    private boolean m_serverManager__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // 23, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.248"></a>
+<span class="sourceLineNo">246</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // 22, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
 <span class="sourceLineNo">249</span>    {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      // 23, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      m_servers = servers;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      m_servers__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span>      // 22, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      m_metaLocation = metaLocation;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
 <span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    public List&lt;ServerName&gt; getServers()<a name="line.254"></a>
+<span class="sourceLineNo">254</span>    public ServerName getMetaLocation()<a name="line.254"></a>
 <span class="sourceLineNo">255</span>    {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return m_servers;<a name="line.256"></a>
+<span class="sourceLineNo">256</span>      return m_metaLocation;<a name="line.256"></a>
 <span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    private List&lt;ServerName&gt; m_servers;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public boolean getServers__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span>    private ServerName m_metaLocation;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
 <span class="sourceLineNo">260</span>    {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      return m_servers__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span>      return m_metaLocation__IsNotDefault;<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    private boolean m_servers__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.263"></a>
 <span class="sourceLineNo">264</span>  }<a name="line.264"></a>
 <span class="sourceLineNo">265</span>  @Override<a name="line.265"></a>
 <span class="sourceLineNo">266</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,66 +280,66 @@
 <span class="sourceLineNo">272</span>    return (ImplData) super.getImplData();<a name="line.272"></a>
 <span class="sourceLineNo">273</span>  }<a name="line.273"></a>
 <span class="sourceLineNo">274</span>  <a name="line.274"></a>
-<span class="sourceLineNo">275</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.276"></a>
+<span class="sourceLineNo">275</span>  protected String filter;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.276"></a>
 <span class="sourceLineNo">277</span>  {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.278"></a>
+<span class="sourceLineNo">278</span>    (getImplData()).setFilter(p_filter);<a name="line.278"></a>
 <span class="sourceLineNo">279</span>    return this;<a name="line.279"></a>
 <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>  protected ServerName metaLocation;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.283"></a>
+<span class="sourceLineNo">282</span>  protected String format;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.283"></a>
 <span class="sourceLineNo">284</span>  {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.285"></a>
+<span class="sourceLineNo">285</span>    (getImplData()).setFormat(p_format);<a name="line.285"></a>
 <span class="sourceLineNo">286</span>    return this;<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>  protected String filter;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.290"></a>
+<span class="sourceLineNo">289</span>  protected AssignmentManager assignmentManager;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.290"></a>
 <span class="sourceLineNo">291</span>  {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    (getImplData()).setFilter(p_filter);<a name="line.292"></a>
+<span class="sourceLineNo">292</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.292"></a>
 <span class="sourceLineNo">293</span>    return this;<a name="line.293"></a>
 <span class="sourceLineNo">294</span>  }<a name="line.294"></a>
 <span class="sourceLineNo">295</span>  <a name="line.295"></a>
-<span class="sourceLineNo">296</span>  protected boolean catalogJanitorEnabled;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.297"></a>
+<span class="sourceLineNo">296</span>  protected List&lt;ServerName&gt; servers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.297"></a>
 <span class="sourceLineNo">298</span>  {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.299"></a>
+<span class="sourceLineNo">299</span>    (getImplData()).setServers(p_servers);<a name="line.299"></a>
 <span class="sourceLineNo">300</span>    return this;<a name="line.300"></a>
 <span class="sourceLineNo">301</span>  }<a name="line.301"></a>
 <span class="sourceLineNo">302</span>  <a name="line.302"></a>
-<span class="sourceLineNo">303</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.304"></a>
+<span class="sourceLineNo">303</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.304"></a>
 <span class="sourceLineNo">305</span>  {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    (getImplData()).setFrags(p_frags);<a name="line.306"></a>
+<span class="sourceLineNo">306</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.306"></a>
 <span class="sourceLineNo">307</span>    return this;<a name="line.307"></a>
 <span class="sourceLineNo">308</span>  }<a name="line.308"></a>
 <span class="sourceLineNo">309</span>  <a name="line.309"></a>
-<span class="sourceLineNo">310</span>  protected String format;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.311"></a>
+<span class="sourceLineNo">310</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.311"></a>
 <span class="sourceLineNo">312</span>  {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    (getImplData()).setFormat(p_format);<a name="line.313"></a>
+<span class="sourceLineNo">313</span>    (getImplData()).setFrags(p_frags);<a name="line.313"></a>
 <span class="sourceLineNo">314</span>    return this;<a name="line.314"></a>
 <span class="sourceLineNo">315</span>  }<a name="line.315"></a>
 <span class="sourceLineNo">316</span>  <a name="line.316"></a>
-<span class="sourceLineNo">317</span>  protected AssignmentManager assignmentManager;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
+<span class="sourceLineNo">317</span>  protected ServerManager serverManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.318"></a>
 <span class="sourceLineNo">319</span>  {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
+<span class="sourceLineNo">320</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.320"></a>
 <span class="sourceLineNo">321</span>    return this;<a name="line.321"></a>
 <span class="sourceLineNo">322</span>  }<a name="line.322"></a>
 <span class="sourceLineNo">323</span>  <a name="line.323"></a>
-<span class="sourceLineNo">324</span>  protected ServerManager serverManager;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.325"></a>
+<span class="sourceLineNo">324</span>  protected boolean catalogJanitorEnabled;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.325"></a>
 <span class="sourceLineNo">326</span>  {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>    return this;<a name="line.328"></a>
 <span class="sourceLineNo">329</span>  }<a name="line.329"></a>
 <span class="sourceLineNo">330</span>  <a name="line.330"></a>
-<span class="sourceLineNo">331</span>  protected List&lt;ServerName&gt; servers;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.332"></a>
+<span class="sourceLineNo">331</span>  protected ServerName metaLocation;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
 <span class="sourceLineNo">333</span>  {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    (getImplData()).setServers(p_servers);<a name="line.334"></a>
+<span class="sourceLineNo">334</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
 <span class="sourceLineNo">335</span>    return this;<a name="line.335"></a>
 <span class="sourceLineNo">336</span>  }<a name="line.336"></a>
 <span class="sourceLineNo">337</span>  <a name="line.337"></a>


[06/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index c9163be..1bd69da 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Continuous Integration</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -290,7 +290,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 6e22e73..7835818 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Issue Tracking</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -287,7 +287,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index 92b8d62..87de816 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project License</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -490,7 +490,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index 3dd157b..03e6391 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Mailing Lists</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -340,7 +340,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index f7a7cf1..6e545e5 100644
--- a/metrics.html
+++ b/metrics.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) Metrics
@@ -458,7 +458,7 @@ export HBASE_REGIONSERVER_OPTS=&quot;$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/modules.html
----------------------------------------------------------------------
diff --git a/modules.html b/modules.html
index 77a91e4..b876ca9 100644
--- a/modules.html
+++ b/modules.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Modules</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index 1396ee7..252cd8b 100644
--- a/old_news.html
+++ b/old_news.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Old Apache HBase (TM) News
@@ -413,7 +413,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index 1c0afe2..ed07849 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Plugin Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -423,7 +423,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 8b78467..faba5a7 100644
--- a/plugins.html
+++ b/plugins.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Build Plugins</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 70cd261..b0f2b5b 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Powered By Apache HBase™</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -768,7 +768,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index 6bcf555..1199d56 100644
--- a/project-info.html
+++ b/project-info.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -340,7 +340,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index 93558e6..125f4e5 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Generated Reports</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -310,7 +310,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index a741980..e46ff6b 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Summary</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -330,7 +330,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index 84f8d54..c6fe195 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
 Running Apache HBase (TM) in pseudo-distributed mode
@@ -307,7 +307,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index 9d0f7a7..4b7c795 100644
--- a/replication.html
+++ b/replication.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Apache HBase (TM) Replication
@@ -302,7 +302,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index 6f71159..2c2c370 100644
--- a/resources.html
+++ b/resources.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Other Apache HBase (TM) Resources</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -324,7 +324,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index 092ec7d..d8ad2d5 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Source Repository</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -298,7 +298,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index f85dc10..2dbac06 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBase™ Sponsors</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -332,7 +332,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 8857fc2..cdbb9f5 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Supporting Projects</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -519,7 +519,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index ac7eeda..ff04ada 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Team list</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -785,7 +785,7 @@ window.onLoad = init();
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 84d92b9..e34e3b4 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -40686,6 +40686,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testRegionBoundariesCheck()">testRegionBoundariesCheck()</a></span> - Method in class org.apache.hadoop.hbase.util.<a href="./org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html" title="class in org.apache.hadoop.hbase.util">TestHBaseFsckOneRS</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testRegionBoundariesCheckWithFlushTable()">testRegionBoundariesCheckWithFlushTable()</a></span> - Method in class org.apache.hadoop.hbase.util.<a href="./org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html" title="class in org.apache.hadoop.hbase.util">TestHBaseFsckOneRS</a></dt>
+<dd>
+<div class="block">test region boundaries and make sure store file had been created.</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/client/TestHCM.html#testRegionCaching()">testRegionCaching()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="./org/apache/hadoop/hbase/client/TestHCM.html" title="class in org.apache.hadoop.hbase.client">TestHCM</a></dt>
 <dd>
 <div class="block">Test that when we delete a location using the first row of a region

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 270ccc4..149878b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -156,8 +156,8 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestHFileBlockCompatibility.Writer.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TagUsage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestHFileBlockCompatibility.Writer.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">TestCacheOnWrite.CacheOnWriteType</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 9185af5..4530df0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -505,15 +505,15 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ResourceChecker.Phase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HBaseClusterManager.CommandProvider.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="strong">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ResourceChecker.Phase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="strong">ScanPerformanceEvaluation.ScanCounter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="strong">RESTApiClusterManager.RoleCommand</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index f45510d..b6de721 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -145,8 +145,8 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index fae4c42..7d1737c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -542,8 +542,8 @@
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">TestAtomicOperation.TestStep</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DataBlockEncodingTool.Manipulation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.AuthenticationTokenSecretManagerForTest.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.AuthenticationTokenSecretManagerForTest.html b/testdevapidocs/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.AuthenticationTokenSecretManagerForTest.html
index c58527d..e676f83 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.AuthenticationTokenSecretManagerForTest.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.AuthenticationTokenSecretManagerForTest.html
@@ -205,7 +205,7 @@ extends org.apache.hadoop.hbase.security.token.AuthenticationTokenSecretManager<
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.security.token.AuthenticationTokenSecretManager</h3>
-<code><clinit>, addKey, createIdentifier, createPassword, createSecretKey, generateToken, getCurrentKey, getKey, getName, isCurrentKeyRolled, isMaster, removeExpiredKeys, retrievePassword, rollCurrentKey, start, stop</code></li>
+<code><clinit>, addKey, createIdentifier, createPassword, createSecretKey, generateToken, getCurrentKey, getKey, getLastKeyUpdate, getName, isCurrentKeyRolled, isMaster, removeExpiredKeys, retrievePassword, rollCurrentKey, start, stop</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods_inherited_from_class_org.apache.hadoop.security.token.SecretManager">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index cd0e6c5..52b2b91 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -234,9 +234,9 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="strong">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html b/testdevapidocs/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
index fc90b73..ddade3c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
@@ -382,36 +382,42 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testRegionBoundariesCheckWithFlushTable()">testRegionBoundariesCheckWithFlushTable</a></strong>()</code>
+<div class="block">test region boundaries and make sure store file had been created.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testRegionDeployedNotInHdfs()">testRegionDeployedNotInHdfs</a></strong>()</code>
 <div class="block">This creates and fixes a bad table with a missing region which is the 1st region -- hole in
  meta and data missing in the fs.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testRegionHole()">testRegionHole</a></strong>()</code>
 <div class="block">This creates and fixes a bad table with a missing region -- hole in meta
  and data missing in the fs.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testRegionShouldNotBeDeployed()">testRegionShouldNotBeDeployed</a></strong>()</code>
 <div class="block">The region is not deployed when the table is disabled.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testSplitDaughtersNotInMeta()">testSplitDaughtersNotInMeta</a></strong>()</code>
 <div class="block">Split crashed after write to hbase:meta finished for the parent region, but
  failed to write daughters (pre HBASE-7721 codebase)</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testTableWithNoRegions()">testTableWithNoRegions</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#testValidLingeringSplitParent()">testValidLingeringSplitParent</a></strong>()</code>
 <div class="block">Tests that LINGERING_SPLIT_PARENT is not erroneously reported for
@@ -654,13 +660,26 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
 </li>
 </ul>
+<a name="testRegionBoundariesCheckWithFlushTable()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRegionBoundariesCheckWithFlushTable</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.588">testRegionBoundariesCheckWithFlushTable</a>()
+                                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<div class="block">test region boundaries and make sure store file had been created.</div>
+<dl><dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
+</li>
+</ul>
 <a name="testHbckAfterRegionMerge()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>testHbckAfterRegionMerge</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.584">testHbckAfterRegionMerge</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.608">testHbckAfterRegionMerge</a>()
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -672,7 +691,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoHdfsTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.635">testNoHdfsTable</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.659">testNoHdfsTable</a>()
                      throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates entries in hbase:meta with no hdfs data.  This should cleanly
  remove the table.</div>
@@ -686,7 +705,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoVersionFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.675">testNoVersionFile</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.699">testNoVersionFile</a>()
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">when the hbase.version file missing, It is fix the fault.</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -699,7 +718,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoTableState</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.693">testNoTableState</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.717">testNoTableState</a>()
                       throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -711,7 +730,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testFixByTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.721">testFixByTable</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.745">testFixByTable</a>()
                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates two tables and mess both of them and fix them one by one</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -724,7 +743,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testLingeringSplitParent</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.765">testLingeringSplitParent</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.789">testLingeringSplitParent</a>()
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">A split parent in meta, in hdfs, and not deployed</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -737,7 +756,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testValidLingeringSplitParent</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.849">testValidLingeringSplitParent</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.873">testValidLingeringSplitParent</a>()
                                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Tests that LINGERING_SPLIT_PARENT is not erroneously reported for
  valid cases where the daughters are there.</div>
@@ -751,7 +770,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitDaughtersNotInMeta</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.902">testSplitDaughtersNotInMeta</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.926">testSplitDaughtersNotInMeta</a>()
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Split crashed after write to hbase:meta finished for the parent region, but
  failed to write daughters (pre HBASE-7721 codebase)</div>
@@ -765,7 +784,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testMissingFirstRegion</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.984">testMissingFirstRegion</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1008">testMissingFirstRegion</a>()
                             throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with a missing region which is the 1st region -- hole in
  meta and data missing in the fs.</div>
@@ -779,7 +798,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testRegionDeployedNotInHdfs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1012">testRegionDeployedNotInHdfs</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1036">testRegionDeployedNotInHdfs</a>()
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with a missing region which is the 1st region -- hole in
  meta and data missing in the fs.</div>
@@ -793,7 +812,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testMissingLastRegion</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1040">testMissingLastRegion</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1064">testMissingLastRegion</a>()
                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with missing last region -- hole in meta and data missing in
  the fs.</div>
@@ -807,7 +826,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testFixAssignmentsAndNoHdfsChecking</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1068">testFixAssignmentsAndNoHdfsChecking</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1092">testFixAssignmentsAndNoHdfsChecking</a>()
                                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test -noHdfsChecking option can detect and fix assignments issue.</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -820,7 +839,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testFixMetaNotWorkingWithNoHdfsChecking</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1121">testFixMetaNotWorkingWithNoHdfsChecking</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1145">testFixMetaNotWorkingWithNoHdfsChecking</a>()
                                              throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test -noHdfsChecking option can detect region is not in meta but deployed.
  However, it can not fix it without checking Hdfs because we need to get
@@ -835,7 +854,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testFixHdfsHolesNotWorkingWithNoHdfsChecking</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1177">testFixHdfsHolesNotWorkingWithNoHdfsChecking</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1201">testFixHdfsHolesNotWorkingWithNoHdfsChecking</a>()
                                                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test -fixHdfsHoles doesn't work with -noHdfsChecking option,
  and -noHdfsChecking can't detect orphan Hdfs region.</div>
@@ -849,7 +868,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testQuarantineCorruptHFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1238">testQuarantineCorruptHFile</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1262">testQuarantineCorruptHFile</a>()
                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates a table and then corrupts an hfile.  Hbck should quarantine the file.</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -862,7 +881,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testQuarantineMissingHFile</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1279">testQuarantineMissingHFile</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1303">testQuarantineMissingHFile</a>()
                                 throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates a table and simulates the race situation where a concurrent compaction or split
  has removed an hfile after the corruption checker learned about it.</div>
@@ -876,7 +895,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testDegenerateRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1308">testDegenerateRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1332">testDegenerateRegions</a>()
                            throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with regions that has startkey == endkey</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -889,7 +908,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testMissingRegionInfoQualifier</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1347">testMissingRegionInfoQualifier</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1371">testMissingRegionInfoQualifier</a>()
                                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test mission REGIONINFO_QUALIFIER in hbase:meta</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -902,7 +921,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testErrorReporter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1399">testErrorReporter</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1423">testErrorReporter</a>()
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">Test pluggable error reporter. It can be plugged in
  from system property or configuration.</div>
@@ -916,7 +935,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testCheckTableLocks</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1416">testCheckTableLocks</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1440">testCheckTableLocks</a>()
                          throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -928,7 +947,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testCheckReplication</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1491">testCheckReplication</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1515">testCheckReplication</a>()
                           throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -940,7 +959,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testHDFSRegioninfoMissing</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1546">testHDFSRegioninfoMissing</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1570">testHDFSRegioninfoMissing</a>()
                                throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with a missing region -- hole in meta
  and data present but .regioinfino missing (an orphan hdfs region)in the fs.</div>
@@ -954,7 +973,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testNotInMetaOrDeployedHole</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1583">testNotInMetaOrDeployedHole</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1607">testNotInMetaOrDeployedHole</a>()
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with a region that is missing meta and
  not assigned to a region server.</div>
@@ -968,7 +987,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testCleanUpDaughtersNotInMetaAfterFailedSplit</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1619">testCleanUpDaughtersNotInMetaAfterFailedSplit</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1643">testCleanUpDaughtersNotInMetaAfterFailedSplit</a>()
                                                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl><dt><span class="strong">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd></dl>
@@ -980,7 +999,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testNotInMetaHole</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1683">testNotInMetaHole</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1707">testNotInMetaHole</a>()
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates fixes a bad table with a hole in meta.</div>
 <dl><dt><span class="strong">Throws:</span></dt>
@@ -993,7 +1012,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testNotInHdfs</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1723">testNotInHdfs</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1747">testNotInHdfs</a>()
                    throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates and fixes a bad table with a region that is in meta but has
  no deployment or data hdfs</div>
@@ -1007,7 +1026,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockList">
 <li class="blockList">
 <h4>testQuarantineMissingFamdir</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1762">testQuarantineMissingFamdir</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1786">testQuarantineMissingFamdir</a>()
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates a table and simulates the race situation where a concurrent compaction or split
  has removed an colfam dir before the corruption checker got to it.</div>
@@ -1021,7 +1040,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/util/BaseTestHBaseFsck.h
 <ul class="blockListLast">
 <li class="blockList">
 <h4>testQuarantineMissingRegionDir</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1791">testQuarantineMissingRegionDir</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html#line.1815">testQuarantineMissingRegionDir</a>()
                                     throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block">This creates a table and simulates the race situation where a concurrent compaction or split
  has removed a region dir before the corruption checker got to it.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 8dd84e9..ba18d57 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -120,8 +120,8 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">IOTestProvider.AllowedOperations</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">FaultyFSLog.FailureType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">IOTestProvider.AllowedOperations</span></a></li>
 </ul>
 </li>
 </ul>


[08/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index 6e0c552..8564223 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -67,15 +67,15 @@
 <span class="sourceLineNo">059</span>  requiredArguments = {<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    @org.jamon.annotations.Argument(name = "master", type = "HMaster")},<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  optionalArguments = {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName"),<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;")})<a name="line.70"></a>
+<span class="sourceLineNo">062</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    @org.jamon.annotations.Argument(name = "assignmentManager", type = "AssignmentManager"),<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    @org.jamon.annotations.Argument(name = "servers", type = "List&lt;ServerName&gt;"),<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    @org.jamon.annotations.Argument(name = "deadServers", type = "Set&lt;ServerName&gt;"),<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    @org.jamon.annotations.Argument(name = "frags", type = "Map&lt;String,Integer&gt;"),<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    @org.jamon.annotations.Argument(name = "serverManager", type = "ServerManager"),<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    @org.jamon.annotations.Argument(name = "catalogJanitorEnabled", type = "boolean"),<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @org.jamon.annotations.Argument(name = "metaLocation", type = "ServerName")})<a name="line.70"></a>
 <span class="sourceLineNo">071</span>public class MasterStatusTmpl<a name="line.71"></a>
 <span class="sourceLineNo">072</span>  extends org.jamon.AbstractTemplateProxy<a name="line.72"></a>
 <span class="sourceLineNo">073</span>{<a name="line.73"></a>
@@ -116,159 +116,159 @@
 <span class="sourceLineNo">108</span>      return m_master;<a name="line.108"></a>
 <span class="sourceLineNo">109</span>    }<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    private HMaster m_master;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    // 24, 1<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.112"></a>
+<span class="sourceLineNo">111</span>    // 26, 1<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    public void setFilter(String filter)<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // 24, 1<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      m_deadServers = deadServers;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      m_deadServers__IsNotDefault = true;<a name="line.116"></a>
+<span class="sourceLineNo">114</span>      // 26, 1<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      m_filter = filter;<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      m_filter__IsNotDefault = true;<a name="line.116"></a>
 <span class="sourceLineNo">117</span>    }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.118"></a>
+<span class="sourceLineNo">118</span>    public String getFilter()<a name="line.118"></a>
 <span class="sourceLineNo">119</span>    {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return m_deadServers;<a name="line.120"></a>
+<span class="sourceLineNo">120</span>      return m_filter;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    public boolean getDeadServers__IsNotDefault()<a name="line.123"></a>
+<span class="sourceLineNo">122</span>    private String m_filter;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    public boolean getFilter__IsNotDefault()<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      return m_deadServers__IsNotDefault;<a name="line.125"></a>
+<span class="sourceLineNo">125</span>      return m_filter__IsNotDefault;<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    private boolean m_deadServers__IsNotDefault;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // 22, 1<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.129"></a>
+<span class="sourceLineNo">127</span>    private boolean m_filter__IsNotDefault;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // 27, 1<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    public void setFormat(String format)<a name="line.129"></a>
 <span class="sourceLineNo">130</span>    {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // 22, 1<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      m_metaLocation = metaLocation;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      m_metaLocation__IsNotDefault = true;<a name="line.133"></a>
+<span class="sourceLineNo">131</span>      // 27, 1<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      m_format = format;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      m_format__IsNotDefault = true;<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public ServerName getMetaLocation()<a name="line.135"></a>
+<span class="sourceLineNo">135</span>    public String getFormat()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_metaLocation;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_format;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private ServerName m_metaLocation;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.140"></a>
+<span class="sourceLineNo">139</span>    private String m_format;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    public boolean getFormat__IsNotDefault()<a name="line.140"></a>
 <span class="sourceLineNo">141</span>    {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      return m_metaLocation__IsNotDefault;<a name="line.142"></a>
+<span class="sourceLineNo">142</span>      return m_format__IsNotDefault;<a name="line.142"></a>
 <span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // 26, 1<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    public void setFilter(String filter)<a name="line.146"></a>
+<span class="sourceLineNo">144</span>    private boolean m_format__IsNotDefault;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    // 29, 1<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // 26, 1<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      m_filter = filter;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      m_filter__IsNotDefault = true;<a name="line.150"></a>
+<span class="sourceLineNo">148</span>      // 29, 1<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      m_assignmentManager = assignmentManager;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      m_assignmentManager__IsNotDefault = true;<a name="line.150"></a>
 <span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    public String getFilter()<a name="line.152"></a>
+<span class="sourceLineNo">152</span>    public AssignmentManager getAssignmentManager()<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      return m_filter;<a name="line.154"></a>
+<span class="sourceLineNo">154</span>      return m_assignmentManager;<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    private String m_filter;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    public boolean getFilter__IsNotDefault()<a name="line.157"></a>
+<span class="sourceLineNo">156</span>    private AssignmentManager m_assignmentManager;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.157"></a>
 <span class="sourceLineNo">158</span>    {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return m_filter__IsNotDefault;<a name="line.159"></a>
+<span class="sourceLineNo">159</span>      return m_assignmentManager__IsNotDefault;<a name="line.159"></a>
 <span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    private boolean m_filter__IsNotDefault;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    // 25, 1<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.163"></a>
+<span class="sourceLineNo">161</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // 23, 1<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.163"></a>
 <span class="sourceLineNo">164</span>    {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      // 25, 1<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.167"></a>
+<span class="sourceLineNo">165</span>      // 23, 1<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      m_servers = servers;<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      m_servers__IsNotDefault = true;<a name="line.167"></a>
 <span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    public boolean getCatalogJanitorEnabled()<a name="line.169"></a>
+<span class="sourceLineNo">169</span>    public List&lt;ServerName&gt; getServers()<a name="line.169"></a>
 <span class="sourceLineNo">170</span>    {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return m_catalogJanitorEnabled;<a name="line.171"></a>
+<span class="sourceLineNo">171</span>      return m_servers;<a name="line.171"></a>
 <span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    private boolean m_catalogJanitorEnabled;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.174"></a>
+<span class="sourceLineNo">173</span>    private List&lt;ServerName&gt; m_servers;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    public boolean getServers__IsNotDefault()<a name="line.174"></a>
 <span class="sourceLineNo">175</span>    {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.176"></a>
+<span class="sourceLineNo">176</span>      return m_servers__IsNotDefault;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    // 21, 1<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.180"></a>
+<span class="sourceLineNo">178</span>    private boolean m_servers__IsNotDefault;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    // 24, 1<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    public void setDeadServers(Set&lt;ServerName&gt; deadServers)<a name="line.180"></a>
 <span class="sourceLineNo">181</span>    {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      // 21, 1<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      m_frags = frags;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      m_frags__IsNotDefault = true;<a name="line.184"></a>
+<span class="sourceLineNo">182</span>      // 24, 1<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      m_deadServers = deadServers;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      m_deadServers__IsNotDefault = true;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.186"></a>
+<span class="sourceLineNo">186</span>    public Set&lt;ServerName&gt; getDeadServers()<a name="line.186"></a>
 <span class="sourceLineNo">187</span>    {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      return m_frags;<a name="line.188"></a>
+<span class="sourceLineNo">188</span>      return m_deadServers;<a name="line.188"></a>
 <span class="sourceLineNo">189</span>    }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    public boolean getFrags__IsNotDefault()<a name="line.191"></a>
+<span class="sourceLineNo">190</span>    private Set&lt;ServerName&gt; m_deadServers;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean getDeadServers__IsNotDefault()<a name="line.191"></a>
 <span class="sourceLineNo">192</span>    {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return m_frags__IsNotDefault;<a name="line.193"></a>
+<span class="sourceLineNo">193</span>      return m_deadServers__IsNotDefault;<a name="line.193"></a>
 <span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    private boolean m_frags__IsNotDefault;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    // 27, 1<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    public void setFormat(String format)<a name="line.197"></a>
+<span class="sourceLineNo">195</span>    private boolean m_deadServers__IsNotDefault;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    // 21, 1<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public void setFrags(Map&lt;String,Integer&gt; frags)<a name="line.197"></a>
 <span class="sourceLineNo">198</span>    {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      // 27, 1<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      m_format = format;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      m_format__IsNotDefault = true;<a name="line.201"></a>
+<span class="sourceLineNo">199</span>      // 21, 1<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      m_frags = frags;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      m_frags__IsNotDefault = true;<a name="line.201"></a>
 <span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    public String getFormat()<a name="line.203"></a>
+<span class="sourceLineNo">203</span>    public Map&lt;String,Integer&gt; getFrags()<a name="line.203"></a>
 <span class="sourceLineNo">204</span>    {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return m_format;<a name="line.205"></a>
+<span class="sourceLineNo">205</span>      return m_frags;<a name="line.205"></a>
 <span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    private String m_format;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public boolean getFormat__IsNotDefault()<a name="line.208"></a>
+<span class="sourceLineNo">207</span>    private Map&lt;String,Integer&gt; m_frags;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    public boolean getFrags__IsNotDefault()<a name="line.208"></a>
 <span class="sourceLineNo">209</span>    {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      return m_format__IsNotDefault;<a name="line.210"></a>
+<span class="sourceLineNo">210</span>      return m_frags__IsNotDefault;<a name="line.210"></a>
 <span class="sourceLineNo">211</span>    }<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    private boolean m_format__IsNotDefault;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // 29, 1<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    public void setAssignmentManager(AssignmentManager assignmentManager)<a name="line.214"></a>
+<span class="sourceLineNo">212</span>    private boolean m_frags__IsNotDefault;<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    // 28, 1<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    public void setServerManager(ServerManager serverManager)<a name="line.214"></a>
 <span class="sourceLineNo">215</span>    {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      // 29, 1<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      m_assignmentManager = assignmentManager;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      m_assignmentManager__IsNotDefault = true;<a name="line.218"></a>
+<span class="sourceLineNo">216</span>      // 28, 1<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      m_serverManager = serverManager;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      m_serverManager__IsNotDefault = true;<a name="line.218"></a>
 <span class="sourceLineNo">219</span>    }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    public AssignmentManager getAssignmentManager()<a name="line.220"></a>
+<span class="sourceLineNo">220</span>    public ServerManager getServerManager()<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return m_assignmentManager;<a name="line.222"></a>
+<span class="sourceLineNo">222</span>      return m_serverManager;<a name="line.222"></a>
 <span class="sourceLineNo">223</span>    }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    private AssignmentManager m_assignmentManager;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    public boolean getAssignmentManager__IsNotDefault()<a name="line.225"></a>
+<span class="sourceLineNo">224</span>    private ServerManager m_serverManager;<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    public boolean getServerManager__IsNotDefault()<a name="line.225"></a>
 <span class="sourceLineNo">226</span>    {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      return m_assignmentManager__IsNotDefault;<a name="line.227"></a>
+<span class="sourceLineNo">227</span>      return m_serverManager__IsNotDefault;<a name="line.227"></a>
 <span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    private boolean m_assignmentManager__IsNotDefault;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // 28, 1<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    public void setServerManager(ServerManager serverManager)<a name="line.231"></a>
+<span class="sourceLineNo">229</span>    private boolean m_serverManager__IsNotDefault;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    // 25, 1<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    public void setCatalogJanitorEnabled(boolean catalogJanitorEnabled)<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      // 28, 1<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      m_serverManager = serverManager;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      m_serverManager__IsNotDefault = true;<a name="line.235"></a>
+<span class="sourceLineNo">233</span>      // 25, 1<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      m_catalogJanitorEnabled = catalogJanitorEnabled;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      m_catalogJanitorEnabled__IsNotDefault = true;<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    public ServerManager getServerManager()<a name="line.237"></a>
+<span class="sourceLineNo">237</span>    public boolean getCatalogJanitorEnabled()<a name="line.237"></a>
 <span class="sourceLineNo">238</span>    {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return m_serverManager;<a name="line.239"></a>
+<span class="sourceLineNo">239</span>      return m_catalogJanitorEnabled;<a name="line.239"></a>
 <span class="sourceLineNo">240</span>    }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    private ServerManager m_serverManager;<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    public boolean getServerManager__IsNotDefault()<a name="line.242"></a>
+<span class="sourceLineNo">241</span>    private boolean m_catalogJanitorEnabled;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public boolean getCatalogJanitorEnabled__IsNotDefault()<a name="line.242"></a>
 <span class="sourceLineNo">243</span>    {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      return m_serverManager__IsNotDefault;<a name="line.244"></a>
+<span class="sourceLineNo">244</span>      return m_catalogJanitorEnabled__IsNotDefault;<a name="line.244"></a>
 <span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    private boolean m_serverManager__IsNotDefault;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // 23, 1<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    public void setServers(List&lt;ServerName&gt; servers)<a name="line.248"></a>
+<span class="sourceLineNo">246</span>    private boolean m_catalogJanitorEnabled__IsNotDefault;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // 22, 1<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    public void setMetaLocation(ServerName metaLocation)<a name="line.248"></a>
 <span class="sourceLineNo">249</span>    {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      // 23, 1<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      m_servers = servers;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      m_servers__IsNotDefault = true;<a name="line.252"></a>
+<span class="sourceLineNo">250</span>      // 22, 1<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      m_metaLocation = metaLocation;<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      m_metaLocation__IsNotDefault = true;<a name="line.252"></a>
 <span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    public List&lt;ServerName&gt; getServers()<a name="line.254"></a>
+<span class="sourceLineNo">254</span>    public ServerName getMetaLocation()<a name="line.254"></a>
 <span class="sourceLineNo">255</span>    {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return m_servers;<a name="line.256"></a>
+<span class="sourceLineNo">256</span>      return m_metaLocation;<a name="line.256"></a>
 <span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    private List&lt;ServerName&gt; m_servers;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    public boolean getServers__IsNotDefault()<a name="line.259"></a>
+<span class="sourceLineNo">258</span>    private ServerName m_metaLocation;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    public boolean getMetaLocation__IsNotDefault()<a name="line.259"></a>
 <span class="sourceLineNo">260</span>    {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      return m_servers__IsNotDefault;<a name="line.261"></a>
+<span class="sourceLineNo">261</span>      return m_metaLocation__IsNotDefault;<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    private boolean m_servers__IsNotDefault;<a name="line.263"></a>
+<span class="sourceLineNo">263</span>    private boolean m_metaLocation__IsNotDefault;<a name="line.263"></a>
 <span class="sourceLineNo">264</span>  }<a name="line.264"></a>
 <span class="sourceLineNo">265</span>  @Override<a name="line.265"></a>
 <span class="sourceLineNo">266</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.266"></a>
@@ -280,66 +280,66 @@
 <span class="sourceLineNo">272</span>    return (ImplData) super.getImplData();<a name="line.272"></a>
 <span class="sourceLineNo">273</span>  }<a name="line.273"></a>
 <span class="sourceLineNo">274</span>  <a name="line.274"></a>
-<span class="sourceLineNo">275</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.276"></a>
+<span class="sourceLineNo">275</span>  protected String filter;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.276"></a>
 <span class="sourceLineNo">277</span>  {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.278"></a>
+<span class="sourceLineNo">278</span>    (getImplData()).setFilter(p_filter);<a name="line.278"></a>
 <span class="sourceLineNo">279</span>    return this;<a name="line.279"></a>
 <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>  protected ServerName metaLocation;<a name="line.282"></a>
-<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.283"></a>
+<span class="sourceLineNo">282</span>  protected String format;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.283"></a>
 <span class="sourceLineNo">284</span>  {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.285"></a>
+<span class="sourceLineNo">285</span>    (getImplData()).setFormat(p_format);<a name="line.285"></a>
 <span class="sourceLineNo">286</span>    return this;<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>  protected String filter;<a name="line.289"></a>
-<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)<a name="line.290"></a>
+<span class="sourceLineNo">289</span>  protected AssignmentManager assignmentManager;<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.290"></a>
 <span class="sourceLineNo">291</span>  {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    (getImplData()).setFilter(p_filter);<a name="line.292"></a>
+<span class="sourceLineNo">292</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.292"></a>
 <span class="sourceLineNo">293</span>    return this;<a name="line.293"></a>
 <span class="sourceLineNo">294</span>  }<a name="line.294"></a>
 <span class="sourceLineNo">295</span>  <a name="line.295"></a>
-<span class="sourceLineNo">296</span>  protected boolean catalogJanitorEnabled;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.297"></a>
+<span class="sourceLineNo">296</span>  protected List&lt;ServerName&gt; servers;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.297"></a>
 <span class="sourceLineNo">298</span>  {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.299"></a>
+<span class="sourceLineNo">299</span>    (getImplData()).setServers(p_servers);<a name="line.299"></a>
 <span class="sourceLineNo">300</span>    return this;<a name="line.300"></a>
 <span class="sourceLineNo">301</span>  }<a name="line.301"></a>
 <span class="sourceLineNo">302</span>  <a name="line.302"></a>
-<span class="sourceLineNo">303</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.304"></a>
+<span class="sourceLineNo">303</span>  protected Set&lt;ServerName&gt; deadServers;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)<a name="line.304"></a>
 <span class="sourceLineNo">305</span>  {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    (getImplData()).setFrags(p_frags);<a name="line.306"></a>
+<span class="sourceLineNo">306</span>    (getImplData()).setDeadServers(p_deadServers);<a name="line.306"></a>
 <span class="sourceLineNo">307</span>    return this;<a name="line.307"></a>
 <span class="sourceLineNo">308</span>  }<a name="line.308"></a>
 <span class="sourceLineNo">309</span>  <a name="line.309"></a>
-<span class="sourceLineNo">310</span>  protected String format;<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)<a name="line.311"></a>
+<span class="sourceLineNo">310</span>  protected Map&lt;String,Integer&gt; frags;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)<a name="line.311"></a>
 <span class="sourceLineNo">312</span>  {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    (getImplData()).setFormat(p_format);<a name="line.313"></a>
+<span class="sourceLineNo">313</span>    (getImplData()).setFrags(p_frags);<a name="line.313"></a>
 <span class="sourceLineNo">314</span>    return this;<a name="line.314"></a>
 <span class="sourceLineNo">315</span>  }<a name="line.315"></a>
 <span class="sourceLineNo">316</span>  <a name="line.316"></a>
-<span class="sourceLineNo">317</span>  protected AssignmentManager assignmentManager;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(AssignmentManager p_assignmentManager)<a name="line.318"></a>
+<span class="sourceLineNo">317</span>  protected ServerManager serverManager;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.318"></a>
 <span class="sourceLineNo">319</span>  {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    (getImplData()).setAssignmentManager(p_assignmentManager);<a name="line.320"></a>
+<span class="sourceLineNo">320</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.320"></a>
 <span class="sourceLineNo">321</span>    return this;<a name="line.321"></a>
 <span class="sourceLineNo">322</span>  }<a name="line.322"></a>
 <span class="sourceLineNo">323</span>  <a name="line.323"></a>
-<span class="sourceLineNo">324</span>  protected ServerManager serverManager;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(ServerManager p_serverManager)<a name="line.325"></a>
+<span class="sourceLineNo">324</span>  protected boolean catalogJanitorEnabled;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(boolean p_catalogJanitorEnabled)<a name="line.325"></a>
 <span class="sourceLineNo">326</span>  {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    (getImplData()).setServerManager(p_serverManager);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>    return this;<a name="line.328"></a>
 <span class="sourceLineNo">329</span>  }<a name="line.329"></a>
 <span class="sourceLineNo">330</span>  <a name="line.330"></a>
-<span class="sourceLineNo">331</span>  protected List&lt;ServerName&gt; servers;<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)<a name="line.332"></a>
+<span class="sourceLineNo">331</span>  protected ServerName metaLocation;<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  public final org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(ServerName p_metaLocation)<a name="line.332"></a>
 <span class="sourceLineNo">333</span>  {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    (getImplData()).setServers(p_servers);<a name="line.334"></a>
+<span class="sourceLineNo">334</span>    (getImplData()).setMetaLocation(p_metaLocation);<a name="line.334"></a>
 <span class="sourceLineNo">335</span>    return this;<a name="line.335"></a>
 <span class="sourceLineNo">336</span>  }<a name="line.336"></a>
 <span class="sourceLineNo">337</span>  <a name="line.337"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index 04f5741..ac034fe 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -68,15 +68,15 @@
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>{<a name="line.61"></a>
 <span class="sourceLineNo">062</span>  private final HMaster master;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private final Set&lt;ServerName&gt; deadServers;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private final ServerName metaLocation;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  private final String filter;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  private final boolean catalogJanitorEnabled;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private final Map&lt;String,Integer&gt; frags;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  private final String format;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  private final AssignmentManager assignmentManager;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  private final ServerManager serverManager;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private final List&lt;ServerName&gt; servers;<a name="line.71"></a>
+<span class="sourceLineNo">063</span>  private final String filter;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  private final String format;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  private final AssignmentManager assignmentManager;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  private final List&lt;ServerName&gt; servers;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  private final Set&lt;ServerName&gt; deadServers;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  private final Map&lt;String,Integer&gt; frags;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  private final ServerManager serverManager;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  private final boolean catalogJanitorEnabled;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  private final ServerName metaLocation;<a name="line.71"></a>
 <span class="sourceLineNo">072</span>  // 68, 1<a name="line.72"></a>
 <span class="sourceLineNo">073</span>  <a name="line.73"></a>
 <span class="sourceLineNo">074</span>  public String formatZKString() {<a name="line.74"></a>
@@ -106,41 +106,41 @@
 <span class="sourceLineNo">098</span><a name="line.98"></a>
 <span class="sourceLineNo">099</span>  protected static org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData p_implData)<a name="line.99"></a>
 <span class="sourceLineNo">100</span>  {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    if(! p_implData.getDeadServers__IsNotDefault())<a name="line.101"></a>
+<span class="sourceLineNo">101</span>    if(! p_implData.getFilter__IsNotDefault())<a name="line.101"></a>
 <span class="sourceLineNo">102</span>    {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      p_implData.setDeadServers(null);<a name="line.103"></a>
+<span class="sourceLineNo">103</span>      p_implData.setFilter("general");<a name="line.103"></a>
 <span class="sourceLineNo">104</span>    }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    if(! p_implData.getMetaLocation__IsNotDefault())<a name="line.105"></a>
+<span class="sourceLineNo">105</span>    if(! p_implData.getFormat__IsNotDefault())<a name="line.105"></a>
 <span class="sourceLineNo">106</span>    {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      p_implData.setMetaLocation(null);<a name="line.107"></a>
+<span class="sourceLineNo">107</span>      p_implData.setFormat("html");<a name="line.107"></a>
 <span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    if(! p_implData.getFilter__IsNotDefault())<a name="line.109"></a>
+<span class="sourceLineNo">109</span>    if(! p_implData.getAssignmentManager__IsNotDefault())<a name="line.109"></a>
 <span class="sourceLineNo">110</span>    {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      p_implData.setFilter("general");<a name="line.111"></a>
+<span class="sourceLineNo">111</span>      p_implData.setAssignmentManager(null);<a name="line.111"></a>
 <span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    if(! p_implData.getCatalogJanitorEnabled__IsNotDefault())<a name="line.113"></a>
+<span class="sourceLineNo">113</span>    if(! p_implData.getServers__IsNotDefault())<a name="line.113"></a>
 <span class="sourceLineNo">114</span>    {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      p_implData.setCatalogJanitorEnabled(true);<a name="line.115"></a>
+<span class="sourceLineNo">115</span>      p_implData.setServers(null);<a name="line.115"></a>
 <span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    if(! p_implData.getFrags__IsNotDefault())<a name="line.117"></a>
+<span class="sourceLineNo">117</span>    if(! p_implData.getDeadServers__IsNotDefault())<a name="line.117"></a>
 <span class="sourceLineNo">118</span>    {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      p_implData.setFrags(null);<a name="line.119"></a>
+<span class="sourceLineNo">119</span>      p_implData.setDeadServers(null);<a name="line.119"></a>
 <span class="sourceLineNo">120</span>    }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    if(! p_implData.getFormat__IsNotDefault())<a name="line.121"></a>
+<span class="sourceLineNo">121</span>    if(! p_implData.getFrags__IsNotDefault())<a name="line.121"></a>
 <span class="sourceLineNo">122</span>    {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      p_implData.setFormat("html");<a name="line.123"></a>
+<span class="sourceLineNo">123</span>      p_implData.setFrags(null);<a name="line.123"></a>
 <span class="sourceLineNo">124</span>    }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    if(! p_implData.getAssignmentManager__IsNotDefault())<a name="line.125"></a>
+<span class="sourceLineNo">125</span>    if(! p_implData.getServerManager__IsNotDefault())<a name="line.125"></a>
 <span class="sourceLineNo">126</span>    {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      p_implData.setAssignmentManager(null);<a name="line.127"></a>
+<span class="sourceLineNo">127</span>      p_implData.setServerManager(null);<a name="line.127"></a>
 <span class="sourceLineNo">128</span>    }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    if(! p_implData.getServerManager__IsNotDefault())<a name="line.129"></a>
+<span class="sourceLineNo">129</span>    if(! p_implData.getCatalogJanitorEnabled__IsNotDefault())<a name="line.129"></a>
 <span class="sourceLineNo">130</span>    {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      p_implData.setServerManager(null);<a name="line.131"></a>
+<span class="sourceLineNo">131</span>      p_implData.setCatalogJanitorEnabled(true);<a name="line.131"></a>
 <span class="sourceLineNo">132</span>    }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    if(! p_implData.getServers__IsNotDefault())<a name="line.133"></a>
+<span class="sourceLineNo">133</span>    if(! p_implData.getMetaLocation__IsNotDefault())<a name="line.133"></a>
 <span class="sourceLineNo">134</span>    {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      p_implData.setServers(null);<a name="line.135"></a>
+<span class="sourceLineNo">135</span>      p_implData.setMetaLocation(null);<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    }<a name="line.136"></a>
 <span class="sourceLineNo">137</span>    return p_implData;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>  }<a name="line.138"></a>
@@ -148,15 +148,15 @@
 <span class="sourceLineNo">140</span>  {<a name="line.140"></a>
 <span class="sourceLineNo">141</span>    super(p_templateManager, __jamon_setOptionalArguments(p_implData));<a name="line.141"></a>
 <span class="sourceLineNo">142</span>    master = p_implData.getMaster();<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    deadServers = p_implData.getDeadServers();<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    metaLocation = p_implData.getMetaLocation();<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    filter = p_implData.getFilter();<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    frags = p_implData.getFrags();<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    format = p_implData.getFormat();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    assignmentManager = p_implData.getAssignmentManager();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    serverManager = p_implData.getServerManager();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    servers = p_implData.getServers();<a name="line.151"></a>
+<span class="sourceLineNo">143</span>    filter = p_implData.getFilter();<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    format = p_implData.getFormat();<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    assignmentManager = p_implData.getAssignmentManager();<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    servers = p_implData.getServers();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    deadServers = p_implData.getDeadServers();<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    frags = p_implData.getFrags();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    serverManager = p_implData.getServerManager();<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    metaLocation = p_implData.getMetaLocation();<a name="line.151"></a>
 <span class="sourceLineNo">152</span>  }<a name="line.152"></a>
 <span class="sourceLineNo">153</span>  <a name="line.153"></a>
 <span class="sourceLineNo">154</span>  @Override public void renderNoFlush(final java.io.Writer jamonWriter)<a name="line.154"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
index cb816b5..46c00c7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
@@ -33,10 +33,10 @@
 <span class="sourceLineNo">025</span>  requiredArguments = {<a name="line.25"></a>
 <span class="sourceLineNo">026</span>    @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
 <span class="sourceLineNo">027</span>  optionalArguments = {<a name="line.27"></a>
-<span class="sourceLineNo">028</span>    @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.28"></a>
+<span class="sourceLineNo">028</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.28"></a>
 <span class="sourceLineNo">029</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.29"></a>
 <span class="sourceLineNo">030</span>    @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">031</span>    @org.jamon.annotations.Argument(name = "bcn", type = "String")})<a name="line.31"></a>
 <span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
 <span class="sourceLineNo">033</span>  extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
 <span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -77,23 +77,23 @@
 <span class="sourceLineNo">069</span>      return m_regionServer;<a name="line.69"></a>
 <span class="sourceLineNo">070</span>    }<a name="line.70"></a>
 <span class="sourceLineNo">071</span>    private HRegionServer m_regionServer;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // 23, 1<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    public void setBcn(String bcn)<a name="line.73"></a>
+<span class="sourceLineNo">072</span>    // 22, 1<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    public void setFormat(String format)<a name="line.73"></a>
 <span class="sourceLineNo">074</span>    {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      // 23, 1<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      m_bcn = bcn;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      m_bcn__IsNotDefault = true;<a name="line.77"></a>
+<span class="sourceLineNo">075</span>      // 22, 1<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      m_format = format;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      m_format__IsNotDefault = true;<a name="line.77"></a>
 <span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    public String getBcn()<a name="line.79"></a>
+<span class="sourceLineNo">079</span>    public String getFormat()<a name="line.79"></a>
 <span class="sourceLineNo">080</span>    {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return m_bcn;<a name="line.81"></a>
+<span class="sourceLineNo">081</span>      return m_format;<a name="line.81"></a>
 <span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    private String m_bcn;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    public boolean getBcn__IsNotDefault()<a name="line.84"></a>
+<span class="sourceLineNo">083</span>    private String m_format;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    public boolean getFormat__IsNotDefault()<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      return m_bcn__IsNotDefault;<a name="line.86"></a>
+<span class="sourceLineNo">086</span>      return m_format__IsNotDefault;<a name="line.86"></a>
 <span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    private boolean m_bcn__IsNotDefault;<a name="line.88"></a>
+<span class="sourceLineNo">088</span>    private boolean m_format__IsNotDefault;<a name="line.88"></a>
 <span class="sourceLineNo">089</span>    // 21, 1<a name="line.89"></a>
 <span class="sourceLineNo">090</span>    public void setFilter(String filter)<a name="line.90"></a>
 <span class="sourceLineNo">091</span>    {<a name="line.91"></a>
@@ -128,23 +128,23 @@
 <span class="sourceLineNo">120</span>      return m_bcv__IsNotDefault;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
 <span class="sourceLineNo">122</span>    private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // 22, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    public void setFormat(String format)<a name="line.124"></a>
+<span class="sourceLineNo">123</span>    // 23, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    public void setBcn(String bcn)<a name="line.124"></a>
 <span class="sourceLineNo">125</span>    {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      // 22, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      m_format = format;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      m_format__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span>      // 23, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      m_bcn = bcn;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      m_bcn__IsNotDefault = true;<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    public String getFormat()<a name="line.130"></a>
+<span class="sourceLineNo">130</span>    public String getBcn()<a name="line.130"></a>
 <span class="sourceLineNo">131</span>    {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      return m_format;<a name="line.132"></a>
+<span class="sourceLineNo">132</span>      return m_bcn;<a name="line.132"></a>
 <span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    private String m_format;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public boolean getFormat__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span>    private String m_bcn;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    public boolean getBcn__IsNotDefault()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_format__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_bcn__IsNotDefault;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private boolean m_format__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span>    private boolean m_bcn__IsNotDefault;<a name="line.139"></a>
 <span class="sourceLineNo">140</span>  }<a name="line.140"></a>
 <span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
 <span class="sourceLineNo">142</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -156,10 +156,10 @@
 <span class="sourceLineNo">148</span>    return (ImplData) super.getImplData();<a name="line.148"></a>
 <span class="sourceLineNo">149</span>  }<a name="line.149"></a>
 <span class="sourceLineNo">150</span>  <a name="line.150"></a>
-<span class="sourceLineNo">151</span>  protected String bcn;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.152"></a>
+<span class="sourceLineNo">151</span>  protected String format;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.152"></a>
 <span class="sourceLineNo">153</span>  {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    (getImplData()).setBcn(p_bcn);<a name="line.154"></a>
+<span class="sourceLineNo">154</span>    (getImplData()).setFormat(p_format);<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    return this;<a name="line.155"></a>
 <span class="sourceLineNo">156</span>  }<a name="line.156"></a>
 <span class="sourceLineNo">157</span>  <a name="line.157"></a>
@@ -177,10 +177,10 @@
 <span class="sourceLineNo">169</span>    return this;<a name="line.169"></a>
 <span class="sourceLineNo">170</span>  }<a name="line.170"></a>
 <span class="sourceLineNo">171</span>  <a name="line.171"></a>
-<span class="sourceLineNo">172</span>  protected String format;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
+<span class="sourceLineNo">172</span>  protected String bcn;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.173"></a>
 <span class="sourceLineNo">174</span>  {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    (getImplData()).setFormat(p_format);<a name="line.175"></a>
+<span class="sourceLineNo">175</span>    (getImplData()).setBcn(p_bcn);<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    return this;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>  }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>  <a name="line.178"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
index cb816b5..46c00c7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.Intf.html
@@ -33,10 +33,10 @@
 <span class="sourceLineNo">025</span>  requiredArguments = {<a name="line.25"></a>
 <span class="sourceLineNo">026</span>    @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
 <span class="sourceLineNo">027</span>  optionalArguments = {<a name="line.27"></a>
-<span class="sourceLineNo">028</span>    @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.28"></a>
+<span class="sourceLineNo">028</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.28"></a>
 <span class="sourceLineNo">029</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.29"></a>
 <span class="sourceLineNo">030</span>    @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">031</span>    @org.jamon.annotations.Argument(name = "bcn", type = "String")})<a name="line.31"></a>
 <span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
 <span class="sourceLineNo">033</span>  extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
 <span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -77,23 +77,23 @@
 <span class="sourceLineNo">069</span>      return m_regionServer;<a name="line.69"></a>
 <span class="sourceLineNo">070</span>    }<a name="line.70"></a>
 <span class="sourceLineNo">071</span>    private HRegionServer m_regionServer;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // 23, 1<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    public void setBcn(String bcn)<a name="line.73"></a>
+<span class="sourceLineNo">072</span>    // 22, 1<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    public void setFormat(String format)<a name="line.73"></a>
 <span class="sourceLineNo">074</span>    {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      // 23, 1<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      m_bcn = bcn;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      m_bcn__IsNotDefault = true;<a name="line.77"></a>
+<span class="sourceLineNo">075</span>      // 22, 1<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      m_format = format;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      m_format__IsNotDefault = true;<a name="line.77"></a>
 <span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    public String getBcn()<a name="line.79"></a>
+<span class="sourceLineNo">079</span>    public String getFormat()<a name="line.79"></a>
 <span class="sourceLineNo">080</span>    {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return m_bcn;<a name="line.81"></a>
+<span class="sourceLineNo">081</span>      return m_format;<a name="line.81"></a>
 <span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    private String m_bcn;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    public boolean getBcn__IsNotDefault()<a name="line.84"></a>
+<span class="sourceLineNo">083</span>    private String m_format;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    public boolean getFormat__IsNotDefault()<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      return m_bcn__IsNotDefault;<a name="line.86"></a>
+<span class="sourceLineNo">086</span>      return m_format__IsNotDefault;<a name="line.86"></a>
 <span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    private boolean m_bcn__IsNotDefault;<a name="line.88"></a>
+<span class="sourceLineNo">088</span>    private boolean m_format__IsNotDefault;<a name="line.88"></a>
 <span class="sourceLineNo">089</span>    // 21, 1<a name="line.89"></a>
 <span class="sourceLineNo">090</span>    public void setFilter(String filter)<a name="line.90"></a>
 <span class="sourceLineNo">091</span>    {<a name="line.91"></a>
@@ -128,23 +128,23 @@
 <span class="sourceLineNo">120</span>      return m_bcv__IsNotDefault;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
 <span class="sourceLineNo">122</span>    private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // 22, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    public void setFormat(String format)<a name="line.124"></a>
+<span class="sourceLineNo">123</span>    // 23, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    public void setBcn(String bcn)<a name="line.124"></a>
 <span class="sourceLineNo">125</span>    {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      // 22, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      m_format = format;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      m_format__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span>      // 23, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      m_bcn = bcn;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      m_bcn__IsNotDefault = true;<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    public String getFormat()<a name="line.130"></a>
+<span class="sourceLineNo">130</span>    public String getBcn()<a name="line.130"></a>
 <span class="sourceLineNo">131</span>    {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      return m_format;<a name="line.132"></a>
+<span class="sourceLineNo">132</span>      return m_bcn;<a name="line.132"></a>
 <span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    private String m_format;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public boolean getFormat__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span>    private String m_bcn;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    public boolean getBcn__IsNotDefault()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_format__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_bcn__IsNotDefault;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private boolean m_format__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span>    private boolean m_bcn__IsNotDefault;<a name="line.139"></a>
 <span class="sourceLineNo">140</span>  }<a name="line.140"></a>
 <span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
 <span class="sourceLineNo">142</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -156,10 +156,10 @@
 <span class="sourceLineNo">148</span>    return (ImplData) super.getImplData();<a name="line.148"></a>
 <span class="sourceLineNo">149</span>  }<a name="line.149"></a>
 <span class="sourceLineNo">150</span>  <a name="line.150"></a>
-<span class="sourceLineNo">151</span>  protected String bcn;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.152"></a>
+<span class="sourceLineNo">151</span>  protected String format;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.152"></a>
 <span class="sourceLineNo">153</span>  {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    (getImplData()).setBcn(p_bcn);<a name="line.154"></a>
+<span class="sourceLineNo">154</span>    (getImplData()).setFormat(p_format);<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    return this;<a name="line.155"></a>
 <span class="sourceLineNo">156</span>  }<a name="line.156"></a>
 <span class="sourceLineNo">157</span>  <a name="line.157"></a>
@@ -177,10 +177,10 @@
 <span class="sourceLineNo">169</span>    return this;<a name="line.169"></a>
 <span class="sourceLineNo">170</span>  }<a name="line.170"></a>
 <span class="sourceLineNo">171</span>  <a name="line.171"></a>
-<span class="sourceLineNo">172</span>  protected String format;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
+<span class="sourceLineNo">172</span>  protected String bcn;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.173"></a>
 <span class="sourceLineNo">174</span>  {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    (getImplData()).setFormat(p_format);<a name="line.175"></a>
+<span class="sourceLineNo">175</span>    (getImplData()).setBcn(p_bcn);<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    return this;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>  }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>  <a name="line.178"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index cb816b5..46c00c7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -33,10 +33,10 @@
 <span class="sourceLineNo">025</span>  requiredArguments = {<a name="line.25"></a>
 <span class="sourceLineNo">026</span>    @org.jamon.annotations.Argument(name = "regionServer", type = "HRegionServer")},<a name="line.26"></a>
 <span class="sourceLineNo">027</span>  optionalArguments = {<a name="line.27"></a>
-<span class="sourceLineNo">028</span>    @org.jamon.annotations.Argument(name = "bcn", type = "String"),<a name="line.28"></a>
+<span class="sourceLineNo">028</span>    @org.jamon.annotations.Argument(name = "format", type = "String"),<a name="line.28"></a>
 <span class="sourceLineNo">029</span>    @org.jamon.annotations.Argument(name = "filter", type = "String"),<a name="line.29"></a>
 <span class="sourceLineNo">030</span>    @org.jamon.annotations.Argument(name = "bcv", type = "String"),<a name="line.30"></a>
-<span class="sourceLineNo">031</span>    @org.jamon.annotations.Argument(name = "format", type = "String")})<a name="line.31"></a>
+<span class="sourceLineNo">031</span>    @org.jamon.annotations.Argument(name = "bcn", type = "String")})<a name="line.31"></a>
 <span class="sourceLineNo">032</span>public class RSStatusTmpl<a name="line.32"></a>
 <span class="sourceLineNo">033</span>  extends org.jamon.AbstractTemplateProxy<a name="line.33"></a>
 <span class="sourceLineNo">034</span>{<a name="line.34"></a>
@@ -77,23 +77,23 @@
 <span class="sourceLineNo">069</span>      return m_regionServer;<a name="line.69"></a>
 <span class="sourceLineNo">070</span>    }<a name="line.70"></a>
 <span class="sourceLineNo">071</span>    private HRegionServer m_regionServer;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // 23, 1<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    public void setBcn(String bcn)<a name="line.73"></a>
+<span class="sourceLineNo">072</span>    // 22, 1<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    public void setFormat(String format)<a name="line.73"></a>
 <span class="sourceLineNo">074</span>    {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      // 23, 1<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      m_bcn = bcn;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      m_bcn__IsNotDefault = true;<a name="line.77"></a>
+<span class="sourceLineNo">075</span>      // 22, 1<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      m_format = format;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      m_format__IsNotDefault = true;<a name="line.77"></a>
 <span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    public String getBcn()<a name="line.79"></a>
+<span class="sourceLineNo">079</span>    public String getFormat()<a name="line.79"></a>
 <span class="sourceLineNo">080</span>    {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return m_bcn;<a name="line.81"></a>
+<span class="sourceLineNo">081</span>      return m_format;<a name="line.81"></a>
 <span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    private String m_bcn;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    public boolean getBcn__IsNotDefault()<a name="line.84"></a>
+<span class="sourceLineNo">083</span>    private String m_format;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    public boolean getFormat__IsNotDefault()<a name="line.84"></a>
 <span class="sourceLineNo">085</span>    {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      return m_bcn__IsNotDefault;<a name="line.86"></a>
+<span class="sourceLineNo">086</span>      return m_format__IsNotDefault;<a name="line.86"></a>
 <span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    private boolean m_bcn__IsNotDefault;<a name="line.88"></a>
+<span class="sourceLineNo">088</span>    private boolean m_format__IsNotDefault;<a name="line.88"></a>
 <span class="sourceLineNo">089</span>    // 21, 1<a name="line.89"></a>
 <span class="sourceLineNo">090</span>    public void setFilter(String filter)<a name="line.90"></a>
 <span class="sourceLineNo">091</span>    {<a name="line.91"></a>
@@ -128,23 +128,23 @@
 <span class="sourceLineNo">120</span>      return m_bcv__IsNotDefault;<a name="line.120"></a>
 <span class="sourceLineNo">121</span>    }<a name="line.121"></a>
 <span class="sourceLineNo">122</span>    private boolean m_bcv__IsNotDefault;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // 22, 1<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    public void setFormat(String format)<a name="line.124"></a>
+<span class="sourceLineNo">123</span>    // 23, 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    public void setBcn(String bcn)<a name="line.124"></a>
 <span class="sourceLineNo">125</span>    {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      // 22, 1<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      m_format = format;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      m_format__IsNotDefault = true;<a name="line.128"></a>
+<span class="sourceLineNo">126</span>      // 23, 1<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      m_bcn = bcn;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      m_bcn__IsNotDefault = true;<a name="line.128"></a>
 <span class="sourceLineNo">129</span>    }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    public String getFormat()<a name="line.130"></a>
+<span class="sourceLineNo">130</span>    public String getBcn()<a name="line.130"></a>
 <span class="sourceLineNo">131</span>    {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      return m_format;<a name="line.132"></a>
+<span class="sourceLineNo">132</span>      return m_bcn;<a name="line.132"></a>
 <span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    private String m_format;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    public boolean getFormat__IsNotDefault()<a name="line.135"></a>
+<span class="sourceLineNo">134</span>    private String m_bcn;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    public boolean getBcn__IsNotDefault()<a name="line.135"></a>
 <span class="sourceLineNo">136</span>    {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      return m_format__IsNotDefault;<a name="line.137"></a>
+<span class="sourceLineNo">137</span>      return m_bcn__IsNotDefault;<a name="line.137"></a>
 <span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    private boolean m_format__IsNotDefault;<a name="line.139"></a>
+<span class="sourceLineNo">139</span>    private boolean m_bcn__IsNotDefault;<a name="line.139"></a>
 <span class="sourceLineNo">140</span>  }<a name="line.140"></a>
 <span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
 <span class="sourceLineNo">142</span>  protected org.jamon.AbstractTemplateProxy.ImplData makeImplData()<a name="line.142"></a>
@@ -156,10 +156,10 @@
 <span class="sourceLineNo">148</span>    return (ImplData) super.getImplData();<a name="line.148"></a>
 <span class="sourceLineNo">149</span>  }<a name="line.149"></a>
 <span class="sourceLineNo">150</span>  <a name="line.150"></a>
-<span class="sourceLineNo">151</span>  protected String bcn;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.152"></a>
+<span class="sourceLineNo">151</span>  protected String format;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.152"></a>
 <span class="sourceLineNo">153</span>  {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    (getImplData()).setBcn(p_bcn);<a name="line.154"></a>
+<span class="sourceLineNo">154</span>    (getImplData()).setFormat(p_format);<a name="line.154"></a>
 <span class="sourceLineNo">155</span>    return this;<a name="line.155"></a>
 <span class="sourceLineNo">156</span>  }<a name="line.156"></a>
 <span class="sourceLineNo">157</span>  <a name="line.157"></a>
@@ -177,10 +177,10 @@
 <span class="sourceLineNo">169</span>    return this;<a name="line.169"></a>
 <span class="sourceLineNo">170</span>  }<a name="line.170"></a>
 <span class="sourceLineNo">171</span>  <a name="line.171"></a>
-<span class="sourceLineNo">172</span>  protected String format;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setFormat(String p_format)<a name="line.173"></a>
+<span class="sourceLineNo">172</span>  protected String bcn;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public final org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl setBcn(String p_bcn)<a name="line.173"></a>
 <span class="sourceLineNo">174</span>  {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    (getImplData()).setFormat(p_format);<a name="line.175"></a>
+<span class="sourceLineNo">175</span>    (getImplData()).setBcn(p_bcn);<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    return this;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>  }<a name="line.177"></a>
 <span class="sourceLineNo">178</span>  <a name="line.178"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index 961378a..d805108 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -34,15 +34,15 @@
 <span class="sourceLineNo">026</span><a name="line.26"></a>
 <span class="sourceLineNo">027</span>{<a name="line.27"></a>
 <span class="sourceLineNo">028</span>  private final HRegionServer regionServer;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>  private final String bcn;<a name="line.29"></a>
+<span class="sourceLineNo">029</span>  private final String format;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>  private final String filter;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>  private final String bcv;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>  private final String format;<a name="line.32"></a>
+<span class="sourceLineNo">032</span>  private final String bcn;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>  protected static org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl.ImplData p_implData)<a name="line.33"></a>
 <span class="sourceLineNo">034</span>  {<a name="line.34"></a>
-<span class="sourceLineNo">035</span>    if(! p_implData.getBcn__IsNotDefault())<a name="line.35"></a>
+<span class="sourceLineNo">035</span>    if(! p_implData.getFormat__IsNotDefault())<a name="line.35"></a>
 <span class="sourceLineNo">036</span>    {<a name="line.36"></a>
-<span class="sourceLineNo">037</span>      p_implData.setBcn("");<a name="line.37"></a>
+<span class="sourceLineNo">037</span>      p_implData.setFormat("html");<a name="line.37"></a>
 <span class="sourceLineNo">038</span>    }<a name="line.38"></a>
 <span class="sourceLineNo">039</span>    if(! p_implData.getFilter__IsNotDefault())<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    {<a name="line.40"></a>
@@ -52,9 +52,9 @@
 <span class="sourceLineNo">044</span>    {<a name="line.44"></a>
 <span class="sourceLineNo">045</span>      p_implData.setBcv("");<a name="line.45"></a>
 <span class="sourceLineNo">046</span>    }<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    if(! p_implData.getFormat__IsNotDefault())<a name="line.47"></a>
+<span class="sourceLineNo">047</span>    if(! p_implData.getBcn__IsNotDefault())<a name="line.47"></a>
 <span class="sourceLineNo">048</span>    {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      p_implData.setFormat("html");<a name="line.49"></a>
+<span class="sourceLineNo">049</span>      p_implData.setBcn("");<a name="line.49"></a>
 <span class="sourceLineNo">050</span>    }<a name="line.50"></a>
 <span class="sourceLineNo">051</span>    return p_implData;<a name="line.51"></a>
 <span class="sourceLineNo">052</span>  }<a name="line.52"></a>
@@ -62,10 +62,10 @@
 <span class="sourceLineNo">054</span>  {<a name="line.54"></a>
 <span class="sourceLineNo">055</span>    super(p_templateManager, __jamon_setOptionalArguments(p_implData));<a name="line.55"></a>
 <span class="sourceLineNo">056</span>    regionServer = p_implData.getRegionServer();<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    bcn = p_implData.getBcn();<a name="line.57"></a>
+<span class="sourceLineNo">057</span>    format = p_implData.getFormat();<a name="line.57"></a>
 <span class="sourceLineNo">058</span>    filter = p_implData.getFilter();<a name="line.58"></a>
 <span class="sourceLineNo">059</span>    bcv = p_implData.getBcv();<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    format = p_implData.getFormat();<a name="line.60"></a>
+<span class="sourceLineNo">060</span>    bcn = p_implData.getBcn();<a name="line.60"></a>
 <span class="sourceLineNo">061</span>  }<a name="line.61"></a>
 <span class="sourceLineNo">062</span>  <a name="line.62"></a>
 <span class="sourceLineNo">063</span>  @Override public void renderNoFlush(final java.io.Writer jamonWriter)<a name="line.63"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.CheckRegionConsistencyWorkItem.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.FileLockCallable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.FileLockCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.FileLockCallable.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.FileLockCallable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.FileLockCallable.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>


[11/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
index 7532a76..3cac758 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html
@@ -379,166 +379,166 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
 <pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.110">m_master</a></pre>
 </li>
 </ul>
-<a name="m_deadServers">
+<a name="m_filter">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_deadServers</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_deadServers</a></pre>
+<h4>m_filter</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.122">m_filter</a></pre>
 </li>
 </ul>
-<a name="m_deadServers__IsNotDefault">
+<a name="m_filter__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_deadServers__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_deadServers__IsNotDefault</a></pre>
+<h4>m_filter__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.127">m_filter__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_metaLocation">
+<a name="m_format">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_metaLocation</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_metaLocation</a></pre>
+<h4>m_format</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.139">m_format</a></pre>
 </li>
 </ul>
-<a name="m_metaLocation__IsNotDefault">
+<a name="m_format__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_metaLocation__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_metaLocation__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.144">m_format__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_filter">
+<a name="m_assignmentManager">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_filter</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.156">m_filter</a></pre>
+<h4>m_assignmentManager</h4>
+<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.156">m_assignmentManager</a></pre>
 </li>
 </ul>
-<a name="m_filter__IsNotDefault">
+<a name="m_assignmentManager__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_filter__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.161">m_filter__IsNotDefault</a></pre>
+<h4>m_assignmentManager__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.161">m_assignmentManager__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_catalogJanitorEnabled">
+<a name="m_servers">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_catalogJanitorEnabled</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_catalogJanitorEnabled</a></pre>
+<h4>m_servers</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.173">m_servers</a></pre>
 </li>
 </ul>
-<a name="m_catalogJanitorEnabled__IsNotDefault">
+<a name="m_servers__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_catalogJanitorEnabled__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_catalogJanitorEnabled__IsNotDefault</a></pre>
+<h4>m_servers__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.178">m_servers__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_frags">
+<a name="m_deadServers">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_frags</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.190">m_frags</a></pre>
+<h4>m_deadServers</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.190">m_deadServers</a></pre>
 </li>
 </ul>
-<a name="m_frags__IsNotDefault">
+<a name="m_deadServers__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_frags__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_frags__IsNotDefault</a></pre>
+<h4>m_deadServers__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.195">m_deadServers__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_format">
+<a name="m_frags">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_format</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_format</a></pre>
+<h4>m_frags</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.207">m_frags</a></pre>
 </li>
 </ul>
-<a name="m_format__IsNotDefault">
+<a name="m_frags__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_format__IsNotDefault</a></pre>
+<h4>m_frags__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.212">m_frags__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_assignmentManager">
+<a name="m_serverManager">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_assignmentManager</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_assignmentManager</a></pre>
+<h4>m_serverManager</h4>
+<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.224">m_serverManager</a></pre>
 </li>
 </ul>
-<a name="m_assignmentManager__IsNotDefault">
+<a name="m_serverManager__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_assignmentManager__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_assignmentManager__IsNotDefault</a></pre>
+<h4>m_serverManager__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.229">m_serverManager__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_serverManager">
+<a name="m_catalogJanitorEnabled">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_serverManager</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_serverManager</a></pre>
+<h4>m_catalogJanitorEnabled</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.241">m_catalogJanitorEnabled</a></pre>
 </li>
 </ul>
-<a name="m_serverManager__IsNotDefault">
+<a name="m_catalogJanitorEnabled__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_serverManager__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_serverManager__IsNotDefault</a></pre>
+<h4>m_catalogJanitorEnabled__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.246">m_catalogJanitorEnabled__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_servers">
+<a name="m_metaLocation">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_servers</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_servers</a></pre>
+<h4>m_metaLocation</h4>
+<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.258">m_metaLocation</a></pre>
 </li>
 </ul>
-<a name="m_servers__IsNotDefault">
+<a name="m_metaLocation__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>m_servers__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_servers__IsNotDefault</a></pre>
+<h4>m_metaLocation__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.263">m_metaLocation__IsNotDefault</a></pre>
 </li>
 </ul>
 </li>
@@ -584,247 +584,247 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
 <pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.106">getMaster</a>()</pre>
 </li>
 </ul>
-<a name="setDeadServers(java.util.Set)">
+<a name="setFilter(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setDeadServers</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;deadServers)</pre>
+<h4>setFilter</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.112">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;filter)</pre>
 </li>
 </ul>
-<a name="getDeadServers()">
+<a name="getFilter()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getDeadServers</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getDeadServers</a>()</pre>
+<h4>getFilter</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.118">getFilter</a>()</pre>
 </li>
 </ul>
-<a name="getDeadServers__IsNotDefault()">
+<a name="getFilter__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getDeadServers__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getDeadServers__IsNotDefault</a>()</pre>
+<h4>getFilter__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.123">getFilter__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setFormat(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;metaLocation)</pre>
+<h4>setFormat</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.129">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;format)</pre>
 </li>
 </ul>
-<a name="getMetaLocation()">
+<a name="getFormat()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getMetaLocation</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getMetaLocation</a>()</pre>
+<h4>getFormat</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.135">getFormat</a>()</pre>
 </li>
 </ul>
-<a name="getMetaLocation__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getMetaLocation__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getMetaLocation__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.140">getFormat__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setFilter(java.lang.String)">
+<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFilter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.146">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;filter)</pre>
+<h4>setAssignmentManager</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.146">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a>&nbsp;assignmentManager)</pre>
 </li>
 </ul>
-<a name="getFilter()">
+<a name="getAssignmentManager()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFilter</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.152">getFilter</a>()</pre>
+<h4>getAssignmentManager</h4>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.152">getAssignmentManager</a>()</pre>
 </li>
 </ul>
-<a name="getFilter__IsNotDefault()">
+<a name="getAssignmentManager__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFilter__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.157">getFilter__IsNotDefault</a>()</pre>
+<h4>getAssignmentManager__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.157">getAssignmentManager__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setCatalogJanitorEnabled(boolean)">
+<a name="setServers(java.util.List)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setCatalogJanitorEnabled</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setCatalogJanitorEnabled</a>(boolean&nbsp;catalogJanitorEnabled)</pre>
+<h4>setServers</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.163">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;servers)</pre>
 </li>
 </ul>
-<a name="getCatalogJanitorEnabled()">
+<a name="getServers()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getCatalogJanitorEnabled</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getCatalogJanitorEnabled</a>()</pre>
+<h4>getServers</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.169">getServers</a>()</pre>
 </li>
 </ul>
-<a name="getCatalogJanitorEnabled__IsNotDefault()">
+<a name="getServers__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getCatalogJanitorEnabled__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
+<h4>getServers__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.174">getServers__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setFrags(java.util.Map)">
+<a name="setDeadServers(java.util.Set)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFrags</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.180">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;frags)</pre>
+<h4>setDeadServers</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.180">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;deadServers)</pre>
 </li>
 </ul>
-<a name="getFrags()">
+<a name="getDeadServers()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFrags</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.186">getFrags</a>()</pre>
+<h4>getDeadServers</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.186">getDeadServers</a>()</pre>
 </li>
 </ul>
-<a name="getFrags__IsNotDefault()">
+<a name="getDeadServers__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFrags__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getFrags__IsNotDefault</a>()</pre>
+<h4>getDeadServers__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.191">getDeadServers__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setFormat(java.lang.String)">
+<a name="setFrags(java.util.Map)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFormat</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;format)</pre>
+<h4>setFrags</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.197">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;frags)</pre>
 </li>
 </ul>
-<a name="getFormat()">
+<a name="getFrags()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFormat</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getFormat</a>()</pre>
+<h4>getFrags</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.203">getFrags</a>()</pre>
 </li>
 </ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getFrags__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getFormat__IsNotDefault</a>()</pre>
+<h4>getFrags__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.208">getFrags__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
+<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setAssignmentManager</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a>&nbsp;assignmentManager)</pre>
+<h4>setServerManager</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.214">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;serverManager)</pre>
 </li>
 </ul>
-<a name="getAssignmentManager()">
+<a name="getServerManager()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getAssignmentManager</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getAssignmentManager</a>()</pre>
+<h4>getServerManager</h4>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.220">getServerManager</a>()</pre>
 </li>
 </ul>
-<a name="getAssignmentManager__IsNotDefault()">
+<a name="getServerManager__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getAssignmentManager__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getAssignmentManager__IsNotDefault</a>()</pre>
+<h4>getServerManager__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.225">getServerManager__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
+<a name="setCatalogJanitorEnabled(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setServerManager</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;serverManager)</pre>
+<h4>setCatalogJanitorEnabled</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.231">setCatalogJanitorEnabled</a>(boolean&nbsp;catalogJanitorEnabled)</pre>
 </li>
 </ul>
-<a name="getServerManager()">
+<a name="getCatalogJanitorEnabled()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getServerManager</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getServerManager</a>()</pre>
+<h4>getCatalogJanitorEnabled</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.237">getCatalogJanitorEnabled</a>()</pre>
 </li>
 </ul>
-<a name="getServerManager__IsNotDefault()">
+<a name="getCatalogJanitorEnabled__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getServerManager__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getServerManager__IsNotDefault</a>()</pre>
+<h4>getCatalogJanitorEnabled__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.242">getCatalogJanitorEnabled__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setServers(java.util.List)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setServers</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;servers)</pre>
+<h4>setMetaLocation</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.248">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;metaLocation)</pre>
 </li>
 </ul>
-<a name="getServers()">
+<a name="getMetaLocation()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getServers</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getServers</a>()</pre>
+<h4>getMetaLocation</h4>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.254">getMetaLocation</a>()</pre>
 </li>
 </ul>
-<a name="getServers__IsNotDefault()">
+<a name="getMetaLocation__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getServers__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getServers__IsNotDefault</a>()</pre>
+<h4>getMetaLocation__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html#line.259">getMetaLocation__IsNotDefault</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index bd7c924..f0a250a 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -323,85 +323,85 @@ extends org.jamon.AbstractTemplateProxy</pre>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="deadServers">
+<a name="filter">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>deadServers</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.275">deadServers</a></pre>
+<h4>filter</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.275">filter</a></pre>
 </li>
 </ul>
-<a name="metaLocation">
+<a name="format">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>metaLocation</h4>
-<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.282">metaLocation</a></pre>
+<h4>format</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.282">format</a></pre>
 </li>
 </ul>
-<a name="filter">
+<a name="assignmentManager">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>filter</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.289">filter</a></pre>
+<h4>assignmentManager</h4>
+<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.289">assignmentManager</a></pre>
 </li>
 </ul>
-<a name="catalogJanitorEnabled">
+<a name="servers">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>catalogJanitorEnabled</h4>
-<pre>protected&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.296">catalogJanitorEnabled</a></pre>
+<h4>servers</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.296">servers</a></pre>
 </li>
 </ul>
-<a name="frags">
+<a name="deadServers">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>frags</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.303">frags</a></pre>
+<h4>deadServers</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.303">deadServers</a></pre>
 </li>
 </ul>
-<a name="format">
+<a name="frags">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>format</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.310">format</a></pre>
+<h4>frags</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.310">frags</a></pre>
 </li>
 </ul>
-<a name="assignmentManager">
+<a name="serverManager">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>assignmentManager</h4>
-<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.317">assignmentManager</a></pre>
+<h4>serverManager</h4>
+<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.317">serverManager</a></pre>
 </li>
 </ul>
-<a name="serverManager">
+<a name="catalogJanitorEnabled">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>serverManager</h4>
-<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.324">serverManager</a></pre>
+<h4>catalogJanitorEnabled</h4>
+<pre>protected&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.324">catalogJanitorEnabled</a></pre>
 </li>
 </ul>
-<a name="servers">
+<a name="metaLocation">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>servers</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.331">servers</a></pre>
+<h4>metaLocation</h4>
+<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.331">metaLocation</a></pre>
 </li>
 </ul>
 </li>
@@ -473,85 +473,85 @@ extends org.jamon.AbstractTemplateProxy</pre>
 </dl>
 </li>
 </ul>
-<a name="setDeadServers(java.util.Set)">
+<a name="setFilter(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setDeadServers</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.276">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_deadServers)</pre>
+<h4>setFilter</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.276">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_filter)</pre>
 </li>
 </ul>
-<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
+<a name="setFormat(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setMetaLocation</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.283">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;p_metaLocation)</pre>
+<h4>setFormat</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.283">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_format)</pre>
 </li>
 </ul>
-<a name="setFilter(java.lang.String)">
+<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFilter</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.290">setFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_filter)</pre>
+<h4>setAssignmentManager</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.290">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a>&nbsp;p_assignmentManager)</pre>
 </li>
 </ul>
-<a name="setCatalogJanitorEnabled(boolean)">
+<a name="setServers(java.util.List)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setCatalogJanitorEnabled</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.297">setCatalogJanitorEnabled</a>(boolean&nbsp;p_catalogJanitorEnabled)</pre>
+<h4>setServers</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.297">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_servers)</pre>
 </li>
 </ul>
-<a name="setFrags(java.util.Map)">
+<a name="setDeadServers(java.util.Set)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFrags</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.304">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;p_frags)</pre>
+<h4>setDeadServers</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.304">setDeadServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_deadServers)</pre>
 </li>
 </ul>
-<a name="setFormat(java.lang.String)">
+<a name="setFrags(java.util.Map)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFormat</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.311">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_format)</pre>
+<h4>setFrags</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.311">setFrags</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;p_frags)</pre>
 </li>
 </ul>
-<a name="setAssignmentManager(org.apache.hadoop.hbase.master.AssignmentManager)">
+<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setAssignmentManager</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.318">setAssignmentManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a>&nbsp;p_assignmentManager)</pre>
+<h4>setServerManager</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.318">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;p_serverManager)</pre>
 </li>
 </ul>
-<a name="setServerManager(org.apache.hadoop.hbase.master.ServerManager)">
+<a name="setCatalogJanitorEnabled(boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setServerManager</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.325">setServerManager</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a>&nbsp;p_serverManager)</pre>
+<h4>setCatalogJanitorEnabled</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.325">setCatalogJanitorEnabled</a>(boolean&nbsp;p_catalogJanitorEnabled)</pre>
 </li>
 </ul>
-<a name="setServers(java.util.List)">
+<a name="setMetaLocation(org.apache.hadoop.hbase.ServerName)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setServers</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.332">setServers</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;p_servers)</pre>
+<h4>setMetaLocation</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.master">MasterStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html#line.332">setMetaLocation</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&nbsp;p_metaLocation)</pre>
 </li>
 </ul>
 <a name="constructImpl(java.lang.Class)">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index 602d500..413a0b3 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -264,85 +264,85 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/Master
 <pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.62">master</a></pre>
 </li>
 </ul>
-<a name="deadServers">
+<a name="filter">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>deadServers</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.63">deadServers</a></pre>
+<h4>filter</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.63">filter</a></pre>
 </li>
 </ul>
-<a name="metaLocation">
+<a name="format">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>metaLocation</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.64">metaLocation</a></pre>
+<h4>format</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.64">format</a></pre>
 </li>
 </ul>
-<a name="filter">
+<a name="assignmentManager">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>filter</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.65">filter</a></pre>
+<h4>assignmentManager</h4>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.65">assignmentManager</a></pre>
 </li>
 </ul>
-<a name="catalogJanitorEnabled">
+<a name="servers">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>catalogJanitorEnabled</h4>
-<pre>private final&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.66">catalogJanitorEnabled</a></pre>
+<h4>servers</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.66">servers</a></pre>
 </li>
 </ul>
-<a name="frags">
+<a name="deadServers">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>frags</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.67">frags</a></pre>
+<h4>deadServers</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.67">deadServers</a></pre>
 </li>
 </ul>
-<a name="format">
+<a name="frags">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>format</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.68">format</a></pre>
+<h4>frags</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.68">frags</a></pre>
 </li>
 </ul>
-<a name="assignmentManager">
+<a name="serverManager">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>assignmentManager</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html" title="class in org.apache.hadoop.hbase.master">AssignmentManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.69">assignmentManager</a></pre>
+<h4>serverManager</h4>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.69">serverManager</a></pre>
 </li>
 </ul>
-<a name="serverManager">
+<a name="catalogJanitorEnabled">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>serverManager</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html" title="class in org.apache.hadoop.hbase.master">ServerManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.70">serverManager</a></pre>
+<h4>catalogJanitorEnabled</h4>
+<pre>private final&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.70">catalogJanitorEnabled</a></pre>
 </li>
 </ul>
-<a name="servers">
+<a name="metaLocation">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>servers</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.71">servers</a></pre>
+<h4>metaLocation</h4>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html#line.71">metaLocation</a></pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
index 1fe28f2..9013517 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html
@@ -279,22 +279,22 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
 <pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.71">m_regionServer</a></pre>
 </li>
 </ul>
-<a name="m_bcn">
+<a name="m_format">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_bcn</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.83">m_bcn</a></pre>
+<h4>m_format</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.83">m_format</a></pre>
 </li>
 </ul>
-<a name="m_bcn__IsNotDefault">
+<a name="m_format__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_bcn__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.88">m_bcn__IsNotDefault</a></pre>
+<h4>m_format__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.88">m_format__IsNotDefault</a></pre>
 </li>
 </ul>
 <a name="m_filter">
@@ -333,22 +333,22 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
 <pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.122">m_bcv__IsNotDefault</a></pre>
 </li>
 </ul>
-<a name="m_format">
+<a name="m_bcn">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>m_format</h4>
-<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.134">m_format</a></pre>
+<h4>m_bcn</h4>
+<pre>private&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.134">m_bcn</a></pre>
 </li>
 </ul>
-<a name="m_format__IsNotDefault">
+<a name="m_bcn__IsNotDefault">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>m_format__IsNotDefault</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.139">m_format__IsNotDefault</a></pre>
+<h4>m_bcn__IsNotDefault</h4>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.139">m_bcn__IsNotDefault</a></pre>
 </li>
 </ul>
 </li>
@@ -394,31 +394,31 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
 <pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.67">getRegionServer</a>()</pre>
 </li>
 </ul>
-<a name="setBcn(java.lang.String)">
+<a name="setFormat(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setBcn</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.73">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;bcn)</pre>
+<h4>setFormat</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.73">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;format)</pre>
 </li>
 </ul>
-<a name="getBcn()">
+<a name="getFormat()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getBcn</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.79">getBcn</a>()</pre>
+<h4>getFormat</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.79">getFormat</a>()</pre>
 </li>
 </ul>
-<a name="getBcn__IsNotDefault()">
+<a name="getFormat__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getBcn__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.84">getBcn__IsNotDefault</a>()</pre>
+<h4>getFormat__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.84">getFormat__IsNotDefault</a>()</pre>
 </li>
 </ul>
 <a name="setFilter(java.lang.String)">
@@ -475,31 +475,31 @@ extends org.jamon.AbstractTemplateProxy.ImplData</pre>
 <pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.118">getBcv__IsNotDefault</a>()</pre>
 </li>
 </ul>
-<a name="setFormat(java.lang.String)">
+<a name="setBcn(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFormat</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.124">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;format)</pre>
+<h4>setBcn</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.124">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;bcn)</pre>
 </li>
 </ul>
-<a name="getFormat()">
+<a name="getBcn()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getFormat</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.130">getFormat</a>()</pre>
+<h4>getBcn</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.130">getBcn</a>()</pre>
 </li>
 </ul>
-<a name="getFormat__IsNotDefault()">
+<a name="getBcn__IsNotDefault()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getFormat__IsNotDefault</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.135">getFormat__IsNotDefault</a>()</pre>
+<h4>getBcn__IsNotDefault</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.ImplData.html#line.135">getBcn__IsNotDefault</a>()</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
index 83e8813..7dad6c4 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html
@@ -283,13 +283,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="bcn">
+<a name="format">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>bcn</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.151">bcn</a></pre>
+<h4>format</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.151">format</a></pre>
 </li>
 </ul>
 <a name="filter">
@@ -310,13 +310,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
 <pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.165">bcv</a></pre>
 </li>
 </ul>
-<a name="format">
+<a name="bcn">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>format</h4>
-<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.172">format</a></pre>
+<h4>bcn</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.172">bcn</a></pre>
 </li>
 </ul>
 </li>
@@ -388,13 +388,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
 </dl>
 </li>
 </ul>
-<a name="setBcn(java.lang.String)">
+<a name="setFormat(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setBcn</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.152">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_bcn)</pre>
+<h4>setFormat</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.152">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_format)</pre>
 </li>
 </ul>
 <a name="setFilter(java.lang.String)">
@@ -415,13 +415,13 @@ extends org.jamon.AbstractTemplateProxy</pre>
 <pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.166">setBcv</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_bcv)</pre>
 </li>
 </ul>
-<a name="setFormat(java.lang.String)">
+<a name="setBcn(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setFormat</h4>
-<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.173">setFormat</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_format)</pre>
+<h4>setBcn</h4>
+<pre>public final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html" title="class in org.apache.hadoop.hbase.tmpl.regionserver">RSStatusTmpl</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.html#line.173">setBcn</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;p_bcn)</pre>
 </li>
 </ul>
 <a name="constructImpl(java.lang.Class)">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
index 3d0a0f6..e27531a 100644
--- a/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html
@@ -224,13 +224,13 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/
 <pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.28">regionServer</a></pre>
 </li>
 </ul>
-<a name="bcn">
+<a name="format">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>bcn</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.29">bcn</a></pre>
+<h4>format</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.29">format</a></pre>
 </li>
 </ul>
 <a name="filter">
@@ -251,13 +251,13 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/tmpl/regionserver/
 <pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.31">bcv</a></pre>
 </li>
 </ul>
-<a name="format">
+<a name="bcn">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>format</h4>
-<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">format</a></pre>
+<h4>bcn</h4>
+<pre>private final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmplImpl.html#line.32">bcn</a></pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index bd2fd18..dbfaf6d 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -456,13 +456,13 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PrettyPrinter.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PrettyPrinter.Unit</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">ChecksumType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="strong">Order</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 1f810f3..8260133 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -148,9 +148,9 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.Version.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALKey.Version</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALFactory.Providers</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">RegionGroupingProvider.Strategies</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.Version.html" title="enum in org.apache.hadoop.hbase.wal"><span class="strong">WALKey.Version</span></a></li>
 </ul>
 </li>
 </ul>


[07/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HBaseFsckTool.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HBaseFsckTool.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HBaseFsckTool.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HBaseFsckTool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HBaseFsckTool.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HdfsEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HdfsEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HdfsEntry.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HdfsEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HdfsEntry.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.MetaEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.MetaEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.MetaEntry.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.MetaEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.MetaEntry.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.OnlineEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.OnlineEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.OnlineEntry.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.OnlineEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.OnlineEntry.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.PrintingErrorReporter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.PrintingErrorReporter.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.PrintingErrorReporter.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.PrintingErrorReporter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.PrintingErrorReporter.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionBoundariesInformation.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionBoundariesInformation.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionBoundariesInformation.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionBoundariesInformation.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionBoundariesInformation.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.HDFSIntegrityFixer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.HDFSIntegrityFixer.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.HDFSIntegrityFixer.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.HDFSIntegrityFixer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.HDFSIntegrityFixer.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.IntegrityFixSuggester.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.IntegrityFixSuggester.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.IntegrityFixSuggester.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.IntegrityFixSuggester.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.IntegrityFixSuggester.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsDir.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsDir.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsDir.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsDir.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsDir.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsRegionInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsRegionInfo.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsRegionInfo.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsRegionInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemHdfsRegionInfo.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemOverlapMerge.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemOverlapMerge.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemOverlapMerge.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemOverlapMerge.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemOverlapMerge.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemRegion.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemRegion.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemRegion.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemRegion.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.WorkItemRegion.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html
index 265c261..0d9e3f7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html
@@ -803,7 +803,7 @@
 <span class="sourceLineNo">795</span>        }<a name="line.795"></a>
 <span class="sourceLineNo">796</span>        currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();<a name="line.796"></a>
 <span class="sourceLineNo">797</span>        currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;<a name="line.798"></a>
+<span class="sourceLineNo">798</span>        currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);<a name="line.798"></a>
 <span class="sourceLineNo">799</span>        currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);<a name="line.799"></a>
 <span class="sourceLineNo">800</span>        if (currentRegionBoundariesInformation.metaFirstKey.length == 0)<a name="line.800"></a>
 <span class="sourceLineNo">801</span>          currentRegionBoundariesInformation.metaFirstKey = null;<a name="line.801"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/distribution-management.html
----------------------------------------------------------------------
diff --git a/distribution-management.html b/distribution-management.html
index 1e288fe..186cd88 100644
--- a/distribution-management.html
+++ b/distribution-management.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Distribution Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -290,7 +290,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 18fff0b..921ed21 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Export Control
@@ -330,7 +330,7 @@ for more details.</p>
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/checkstyle.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/checkstyle.html b/hbase-annotations/checkstyle.html
index b054c5d..08e2901 100644
--- a/hbase-annotations/checkstyle.html
+++ b/hbase-annotations/checkstyle.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/dependencies.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependencies.html b/hbase-annotations/dependencies.html
index 55bfd46..472253e 100644
--- a/hbase-annotations/dependencies.html
+++ b/hbase-annotations/dependencies.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-convergence.html b/hbase-annotations/dependency-convergence.html
index cf8681b..7440f32 100644
--- a/hbase-annotations/dependency-convergence.html
+++ b/hbase-annotations/dependency-convergence.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/dependency-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-info.html b/hbase-annotations/dependency-info.html
index f402bf9..5e59482 100644
--- a/hbase-annotations/dependency-info.html
+++ b/hbase-annotations/dependency-info.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/dependency-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/dependency-management.html b/hbase-annotations/dependency-management.html
index 4f8763e..e608f58 100644
--- a/hbase-annotations/dependency-management.html
+++ b/hbase-annotations/dependency-management.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/distribution-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/distribution-management.html b/hbase-annotations/distribution-management.html
index b1507d7..447d0f6 100644
--- a/hbase-annotations/distribution-management.html
+++ b/hbase-annotations/distribution-management.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/index.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/index.html b/hbase-annotations/index.html
index 82da500..8f3b3b7 100644
--- a/hbase-annotations/index.html
+++ b/hbase-annotations/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/integration.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/integration.html b/hbase-annotations/integration.html
index 7c7ef26..5dbdd83 100644
--- a/hbase-annotations/integration.html
+++ b/hbase-annotations/integration.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/issue-tracking.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/issue-tracking.html b/hbase-annotations/issue-tracking.html
index 7d4bd88..f9a49c8 100644
--- a/hbase-annotations/issue-tracking.html
+++ b/hbase-annotations/issue-tracking.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/license.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/license.html b/hbase-annotations/license.html
index d8512c4..f8a1283 100644
--- a/hbase-annotations/license.html
+++ b/hbase-annotations/license.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/mail-lists.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/mail-lists.html b/hbase-annotations/mail-lists.html
index 295fc29..c6383c4 100644
--- a/hbase-annotations/mail-lists.html
+++ b/hbase-annotations/mail-lists.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/plugin-management.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/plugin-management.html b/hbase-annotations/plugin-management.html
index 917117e..7a63020 100644
--- a/hbase-annotations/plugin-management.html
+++ b/hbase-annotations/plugin-management.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/plugins.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/plugins.html b/hbase-annotations/plugins.html
index 0a3b54e..7b50faa 100644
--- a/hbase-annotations/plugins.html
+++ b/hbase-annotations/plugins.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/project-info.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-info.html b/hbase-annotations/project-info.html
index d899dea..66caf18 100644
--- a/hbase-annotations/project-info.html
+++ b/hbase-annotations/project-info.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/project-reports.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-reports.html b/hbase-annotations/project-reports.html
index 1850151..e2ead7e 100644
--- a/hbase-annotations/project-reports.html
+++ b/hbase-annotations/project-reports.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/project-summary.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/project-summary.html b/hbase-annotations/project-summary.html
index d74f220..607ac40 100644
--- a/hbase-annotations/project-summary.html
+++ b/hbase-annotations/project-summary.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/source-repository.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/source-repository.html b/hbase-annotations/source-repository.html
index 2a3e211..bf3e164 100644
--- a/hbase-annotations/source-repository.html
+++ b/hbase-annotations/source-repository.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-annotations/team-list.html
----------------------------------------------------------------------
diff --git a/hbase-annotations/team-list.html b/hbase-annotations/team-list.html
index 708a627..2e1bde8 100644
--- a/hbase-annotations/team-list.html
+++ b/hbase-annotations/team-list.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Annotations">Apache HBase - Annotations</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/checkstyle.html
----------------------------------------------------------------------
diff --git a/hbase-spark/checkstyle.html b/hbase-spark/checkstyle.html
index ce57deb..b010bb6 100644
--- a/hbase-spark/checkstyle.html
+++ b/hbase-spark/checkstyle.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/dependencies.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependencies.html b/hbase-spark/dependencies.html
index 5b49016..8eb8ff6 100644
--- a/hbase-spark/dependencies.html
+++ b/hbase-spark/dependencies.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependency-convergence.html b/hbase-spark/dependency-convergence.html
index a918548..b4091d8 100644
--- a/hbase-spark/dependency-convergence.html
+++ b/hbase-spark/dependency-convergence.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/dependency-info.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependency-info.html b/hbase-spark/dependency-info.html
index af2a42f..7fb88b3 100644
--- a/hbase-spark/dependency-info.html
+++ b/hbase-spark/dependency-info.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/dependency-management.html
----------------------------------------------------------------------
diff --git a/hbase-spark/dependency-management.html b/hbase-spark/dependency-management.html
index 19817a0..16b477b 100644
--- a/hbase-spark/dependency-management.html
+++ b/hbase-spark/dependency-management.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/distribution-management.html
----------------------------------------------------------------------
diff --git a/hbase-spark/distribution-management.html b/hbase-spark/distribution-management.html
index 64ba557..e9509ec 100644
--- a/hbase-spark/distribution-management.html
+++ b/hbase-spark/distribution-management.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/index.html
----------------------------------------------------------------------
diff --git a/hbase-spark/index.html b/hbase-spark/index.html
index 55f4870..b1b1364 100644
--- a/hbase-spark/index.html
+++ b/hbase-spark/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/integration.html
----------------------------------------------------------------------
diff --git a/hbase-spark/integration.html b/hbase-spark/integration.html
index 17ea434..9a3d4f4 100644
--- a/hbase-spark/integration.html
+++ b/hbase-spark/integration.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/issue-tracking.html
----------------------------------------------------------------------
diff --git a/hbase-spark/issue-tracking.html b/hbase-spark/issue-tracking.html
index f7052b2..f438add 100644
--- a/hbase-spark/issue-tracking.html
+++ b/hbase-spark/issue-tracking.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/license.html
----------------------------------------------------------------------
diff --git a/hbase-spark/license.html b/hbase-spark/license.html
index 42ba5c4..28be18c 100644
--- a/hbase-spark/license.html
+++ b/hbase-spark/license.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/mail-lists.html
----------------------------------------------------------------------
diff --git a/hbase-spark/mail-lists.html b/hbase-spark/mail-lists.html
index cd43403..de23c3c 100644
--- a/hbase-spark/mail-lists.html
+++ b/hbase-spark/mail-lists.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/plugin-management.html
----------------------------------------------------------------------
diff --git a/hbase-spark/plugin-management.html b/hbase-spark/plugin-management.html
index 5c466bd..8b2a0d4 100644
--- a/hbase-spark/plugin-management.html
+++ b/hbase-spark/plugin-management.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/plugins.html
----------------------------------------------------------------------
diff --git a/hbase-spark/plugins.html b/hbase-spark/plugins.html
index e4666dd..243a36f 100644
--- a/hbase-spark/plugins.html
+++ b/hbase-spark/plugins.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/project-info.html
----------------------------------------------------------------------
diff --git a/hbase-spark/project-info.html b/hbase-spark/project-info.html
index 851563a..5f77403 100644
--- a/hbase-spark/project-info.html
+++ b/hbase-spark/project-info.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/project-reports.html
----------------------------------------------------------------------
diff --git a/hbase-spark/project-reports.html b/hbase-spark/project-reports.html
index bc7df0d..ad3c6c6 100644
--- a/hbase-spark/project-reports.html
+++ b/hbase-spark/project-reports.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/project-summary.html
----------------------------------------------------------------------
diff --git a/hbase-spark/project-summary.html b/hbase-spark/project-summary.html
index cd7eb05..3870397 100644
--- a/hbase-spark/project-summary.html
+++ b/hbase-spark/project-summary.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/source-repository.html
----------------------------------------------------------------------
diff --git a/hbase-spark/source-repository.html b/hbase-spark/source-repository.html
index 27e9344..5d5893e 100644
--- a/hbase-spark/source-repository.html
+++ b/hbase-spark/source-repository.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/hbase-spark/team-list.html
----------------------------------------------------------------------
diff --git a/hbase-spark/team-list.html b/hbase-spark/team-list.html
index 9ea30f3..c28de52 100644
--- a/hbase-spark/team-list.html
+++ b/hbase-spark/team-list.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-21 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2016-01-22 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2016-01-21</span>
+        <span id="publishDate">Last Published: 2016-01-22</span>
                   &nbsp;| <span id="projectVersion">Version: 2.0.0-SNAPSHOT</span>
                       </div>
             <div class="xright">                    <a href="./" title="Apache HBase - Spark">Apache HBase - Spark</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index bb27dc2..dc1efc6 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Apache HBaseâ„¢ Home</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -420,7 +420,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 


[10/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index 271fd72..4bcfbd0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -771,7 +771,7 @@
 <span class="sourceLineNo">763</span>   * Add HBase and its dependencies (only) to the job configuration.<a name="line.763"></a>
 <span class="sourceLineNo">764</span>   * &lt;p&gt;<a name="line.764"></a>
 <span class="sourceLineNo">765</span>   * This is intended as a low-level API, facilitating code reuse between this<a name="line.765"></a>
-<span class="sourceLineNo">766</span>   * class and its mapred counterpart. It also of use to extenral tools that<a name="line.766"></a>
+<span class="sourceLineNo">766</span>   * class and its mapred counterpart. It also of use to external tools that<a name="line.766"></a>
 <span class="sourceLineNo">767</span>   * need to build a MapReduce job that interacts with HBase but want<a name="line.767"></a>
 <span class="sourceLineNo">768</span>   * fine-grained control over the jars shipped to the cluster.<a name="line.768"></a>
 <span class="sourceLineNo">769</span>   * &lt;/p&gt;<a name="line.769"></a>
@@ -780,224 +780,240 @@
 <span class="sourceLineNo">772</span>   * @see &lt;a href="https://issues.apache.org/jira/browse/PIG-3285"&gt;PIG-3285&lt;/a&gt;<a name="line.772"></a>
 <span class="sourceLineNo">773</span>   */<a name="line.773"></a>
 <span class="sourceLineNo">774</span>  public static void addHBaseDependencyJars(Configuration conf) throws IOException {<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    addDependencyJars(conf,<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      // explicitly pull a class from each module<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      org.apache.hadoop.hbase.HConstants.class,                      // hbase-common<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      org.apache.hadoop.hbase.client.Put.class,                      // hbase-client<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat<a name="line.780"></a>
-<span class="sourceLineNo">781</span>      org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      // pull necessary dependencies<a name="line.782"></a>
-<span class="sourceLineNo">783</span>      org.apache.zookeeper.ZooKeeper.class,<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      io.netty.channel.Channel.class,<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      com.google.protobuf.Message.class,<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      com.google.common.collect.Lists.class,<a name="line.786"></a>
-<span class="sourceLineNo">787</span>      org.apache.htrace.Trace.class,<a name="line.787"></a>
-<span class="sourceLineNo">788</span>      com.codahale.metrics.MetricRegistry.class);<a name="line.788"></a>
-<span class="sourceLineNo">789</span>  }<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span>  /**<a name="line.791"></a>
-<span class="sourceLineNo">792</span>   * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.<a name="line.792"></a>
-<span class="sourceLineNo">793</span>   * Also exposed to shell scripts via `bin/hbase mapredcp`.<a name="line.793"></a>
-<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
-<span class="sourceLineNo">795</span>  public static String buildDependencyClasspath(Configuration conf) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>    if (conf == null) {<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      throw new IllegalArgumentException("Must provide a configuration object.");<a name="line.797"></a>
-<span class="sourceLineNo">798</span>    }<a name="line.798"></a>
-<span class="sourceLineNo">799</span>    Set&lt;String&gt; paths = new HashSet&lt;String&gt;(conf.getStringCollection("tmpjars"));<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    if (paths.size() == 0) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      throw new IllegalArgumentException("Configuration contains no tmpjars.");<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span>    StringBuilder sb = new StringBuilder();<a name="line.803"></a>
-<span class="sourceLineNo">804</span>    for (String s : paths) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span>      // entries can take the form 'file:/path/to/file.jar'.<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      int idx = s.indexOf(":");<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      if (idx != -1) s = s.substring(idx + 1);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      if (sb.length() &gt; 0) sb.append(File.pathSeparator);<a name="line.808"></a>
-<span class="sourceLineNo">809</span>      sb.append(s);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    return sb.toString();<a name="line.811"></a>
-<span class="sourceLineNo">812</span>  }<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span>  /**<a name="line.814"></a>
-<span class="sourceLineNo">815</span>   * Add the HBase dependency jars as well as jars for any of the configured<a name="line.815"></a>
-<span class="sourceLineNo">816</span>   * job classes to the job configuration, so that JobClient will ship them<a name="line.816"></a>
-<span class="sourceLineNo">817</span>   * to the cluster and add them to the DistributedCache.<a name="line.817"></a>
-<span class="sourceLineNo">818</span>   */<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  public static void addDependencyJars(Job job) throws IOException {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    addHBaseDependencyJars(job.getConfiguration());<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    try {<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      addDependencyJars(job.getConfiguration(),<a name="line.822"></a>
-<span class="sourceLineNo">823</span>          // when making changes here, consider also mapred.TableMapReduceUtil<a name="line.823"></a>
-<span class="sourceLineNo">824</span>          // pull job classes<a name="line.824"></a>
-<span class="sourceLineNo">825</span>          job.getMapOutputKeyClass(),<a name="line.825"></a>
-<span class="sourceLineNo">826</span>          job.getMapOutputValueClass(),<a name="line.826"></a>
-<span class="sourceLineNo">827</span>          job.getInputFormatClass(),<a name="line.827"></a>
-<span class="sourceLineNo">828</span>          job.getOutputKeyClass(),<a name="line.828"></a>
-<span class="sourceLineNo">829</span>          job.getOutputValueClass(),<a name="line.829"></a>
-<span class="sourceLineNo">830</span>          job.getOutputFormatClass(),<a name="line.830"></a>
-<span class="sourceLineNo">831</span>          job.getPartitionerClass(),<a name="line.831"></a>
-<span class="sourceLineNo">832</span>          job.getCombinerClass());<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    } catch (ClassNotFoundException e) {<a name="line.833"></a>
-<span class="sourceLineNo">834</span>      throw new IOException(e);<a name="line.834"></a>
-<span class="sourceLineNo">835</span>    }<a name="line.835"></a>
-<span class="sourceLineNo">836</span>  }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>  /**<a name="line.838"></a>
-<span class="sourceLineNo">839</span>   * Add the jars containing the given classes to the job's configuration<a name="line.839"></a>
-<span class="sourceLineNo">840</span>   * such that JobClient will ship them to the cluster and add them to<a name="line.840"></a>
-<span class="sourceLineNo">841</span>   * the DistributedCache.<a name="line.841"></a>
-<span class="sourceLineNo">842</span>   */<a name="line.842"></a>
-<span class="sourceLineNo">843</span>  public static void addDependencyJars(Configuration conf,<a name="line.843"></a>
-<span class="sourceLineNo">844</span>      Class&lt;?&gt;... classes) throws IOException {<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    FileSystem localFs = FileSystem.getLocal(conf);<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    Set&lt;String&gt; jars = new HashSet&lt;String&gt;();<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    // Add jars that are already in the tmpjars variable<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    jars.addAll(conf.getStringCollection("tmpjars"));<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>    // add jars as we find them to a map of contents jar name so that we can avoid<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    // creating new jars for classes that have already been packaged.<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    Map&lt;String, String&gt; packagedClasses = new HashMap&lt;String, String&gt;();<a name="line.853"></a>
-<span class="sourceLineNo">854</span><a name="line.854"></a>
-<span class="sourceLineNo">855</span>    // Add jars containing the specified classes<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    for (Class&lt;?&gt; clazz : classes) {<a name="line.856"></a>
-<span class="sourceLineNo">857</span>      if (clazz == null) continue;<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>      Path path = findOrCreateJar(clazz, localFs, packagedClasses);<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      if (path == null) {<a name="line.860"></a>
-<span class="sourceLineNo">861</span>        LOG.warn("Could not find jar for class " + clazz +<a name="line.861"></a>
-<span class="sourceLineNo">862</span>                 " in order to ship it to the cluster.");<a name="line.862"></a>
-<span class="sourceLineNo">863</span>        continue;<a name="line.863"></a>
-<span class="sourceLineNo">864</span>      }<a name="line.864"></a>
-<span class="sourceLineNo">865</span>      if (!localFs.exists(path)) {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>        LOG.warn("Could not validate jar file " + path + " for class "<a name="line.866"></a>
-<span class="sourceLineNo">867</span>                 + clazz);<a name="line.867"></a>
-<span class="sourceLineNo">868</span>        continue;<a name="line.868"></a>
-<span class="sourceLineNo">869</span>      }<a name="line.869"></a>
-<span class="sourceLineNo">870</span>      jars.add(path.toString());<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    }<a name="line.871"></a>
-<span class="sourceLineNo">872</span>    if (jars.isEmpty()) return;<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span>    conf.set("tmpjars", StringUtils.arrayToString(jars.toArray(new String[jars.size()])));<a name="line.874"></a>
-<span class="sourceLineNo">875</span>  }<a name="line.875"></a>
-<span class="sourceLineNo">876</span><a name="line.876"></a>
-<span class="sourceLineNo">877</span>  /**<a name="line.877"></a>
-<span class="sourceLineNo">878</span>   * Finds the Jar for a class or creates it if it doesn't exist. If the class is in<a name="line.878"></a>
-<span class="sourceLineNo">879</span>   * a directory in the classpath, it creates a Jar on the fly with the<a name="line.879"></a>
-<span class="sourceLineNo">880</span>   * contents of the directory and returns the path to that Jar. If a Jar is<a name="line.880"></a>
-<span class="sourceLineNo">881</span>   * created, it is created in the system temporary directory. Otherwise,<a name="line.881"></a>
-<span class="sourceLineNo">882</span>   * returns an existing jar that contains a class of the same name. Maintains<a name="line.882"></a>
-<span class="sourceLineNo">883</span>   * a mapping from jar contents to the tmp jar created.<a name="line.883"></a>
-<span class="sourceLineNo">884</span>   * @param my_class the class to find.<a name="line.884"></a>
-<span class="sourceLineNo">885</span>   * @param fs the FileSystem with which to qualify the returned path.<a name="line.885"></a>
-<span class="sourceLineNo">886</span>   * @param packagedClasses a map of class name to path.<a name="line.886"></a>
-<span class="sourceLineNo">887</span>   * @return a jar file that contains the class.<a name="line.887"></a>
-<span class="sourceLineNo">888</span>   * @throws IOException<a name="line.888"></a>
-<span class="sourceLineNo">889</span>   */<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  private static Path findOrCreateJar(Class&lt;?&gt; my_class, FileSystem fs,<a name="line.890"></a>
-<span class="sourceLineNo">891</span>      Map&lt;String, String&gt; packagedClasses)<a name="line.891"></a>
-<span class="sourceLineNo">892</span>  throws IOException {<a name="line.892"></a>
-<span class="sourceLineNo">893</span>    // attempt to locate an existing jar for the class.<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    String jar = findContainingJar(my_class, packagedClasses);<a name="line.894"></a>
-<span class="sourceLineNo">895</span>    if (null == jar || jar.isEmpty()) {<a name="line.895"></a>
-<span class="sourceLineNo">896</span>      jar = getJar(my_class);<a name="line.896"></a>
-<span class="sourceLineNo">897</span>      updateMap(jar, packagedClasses);<a name="line.897"></a>
-<span class="sourceLineNo">898</span>    }<a name="line.898"></a>
-<span class="sourceLineNo">899</span><a name="line.899"></a>
-<span class="sourceLineNo">900</span>    if (null == jar || jar.isEmpty()) {<a name="line.900"></a>
-<span class="sourceLineNo">901</span>      return null;<a name="line.901"></a>
-<span class="sourceLineNo">902</span>    }<a name="line.902"></a>
-<span class="sourceLineNo">903</span><a name="line.903"></a>
-<span class="sourceLineNo">904</span>    LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    return new Path(jar).makeQualified(fs);<a name="line.905"></a>
-<span class="sourceLineNo">906</span>  }<a name="line.906"></a>
-<span class="sourceLineNo">907</span><a name="line.907"></a>
-<span class="sourceLineNo">908</span>  /**<a name="line.908"></a>
-<span class="sourceLineNo">909</span>   * Add entries to &lt;code&gt;packagedClasses&lt;/code&gt; corresponding to class files<a name="line.909"></a>
-<span class="sourceLineNo">910</span>   * contained in &lt;code&gt;jar&lt;/code&gt;.<a name="line.910"></a>
-<span class="sourceLineNo">911</span>   * @param jar The jar who's content to list.<a name="line.911"></a>
-<span class="sourceLineNo">912</span>   * @param packagedClasses map[class -&gt; jar]<a name="line.912"></a>
-<span class="sourceLineNo">913</span>   */<a name="line.913"></a>
-<span class="sourceLineNo">914</span>  private static void updateMap(String jar, Map&lt;String, String&gt; packagedClasses) throws IOException {<a name="line.914"></a>
-<span class="sourceLineNo">915</span>    if (null == jar || jar.isEmpty()) {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>      return;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>    }<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    ZipFile zip = null;<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    try {<a name="line.919"></a>
-<span class="sourceLineNo">920</span>      zip = new ZipFile(jar);<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      for (Enumeration&lt;? extends ZipEntry&gt; iter = zip.entries(); iter.hasMoreElements();) {<a name="line.921"></a>
-<span class="sourceLineNo">922</span>        ZipEntry entry = iter.nextElement();<a name="line.922"></a>
-<span class="sourceLineNo">923</span>        if (entry.getName().endsWith("class")) {<a name="line.923"></a>
-<span class="sourceLineNo">924</span>          packagedClasses.put(entry.getName(), jar);<a name="line.924"></a>
-<span class="sourceLineNo">925</span>        }<a name="line.925"></a>
-<span class="sourceLineNo">926</span>      }<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    } finally {<a name="line.927"></a>
-<span class="sourceLineNo">928</span>      if (null != zip) zip.close();<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    }<a name="line.929"></a>
-<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span>  /**<a name="line.932"></a>
-<span class="sourceLineNo">933</span>   * Find a jar that contains a class of the same name, if any. It will return<a name="line.933"></a>
-<span class="sourceLineNo">934</span>   * a jar file, even if that is not the first thing on the class path that<a name="line.934"></a>
-<span class="sourceLineNo">935</span>   * has a class with the same name. Looks first on the classpath and then in<a name="line.935"></a>
-<span class="sourceLineNo">936</span>   * the &lt;code&gt;packagedClasses&lt;/code&gt; map.<a name="line.936"></a>
-<span class="sourceLineNo">937</span>   * @param my_class the class to find.<a name="line.937"></a>
-<span class="sourceLineNo">938</span>   * @return a jar file that contains the class, or null.<a name="line.938"></a>
-<span class="sourceLineNo">939</span>   * @throws IOException<a name="line.939"></a>
-<span class="sourceLineNo">940</span>   */<a name="line.940"></a>
-<span class="sourceLineNo">941</span>  private static String findContainingJar(Class&lt;?&gt; my_class, Map&lt;String, String&gt; packagedClasses)<a name="line.941"></a>
-<span class="sourceLineNo">942</span>      throws IOException {<a name="line.942"></a>
-<span class="sourceLineNo">943</span>    ClassLoader loader = my_class.getClassLoader();<a name="line.943"></a>
-<span class="sourceLineNo">944</span><a name="line.944"></a>
-<span class="sourceLineNo">945</span>    String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";<a name="line.945"></a>
-<span class="sourceLineNo">946</span><a name="line.946"></a>
-<span class="sourceLineNo">947</span>    if (loader != null) {<a name="line.947"></a>
-<span class="sourceLineNo">948</span>      // first search the classpath<a name="line.948"></a>
-<span class="sourceLineNo">949</span>      for (Enumeration&lt;URL&gt; itr = loader.getResources(class_file); itr.hasMoreElements();) {<a name="line.949"></a>
-<span class="sourceLineNo">950</span>        URL url = itr.nextElement();<a name="line.950"></a>
-<span class="sourceLineNo">951</span>        if ("jar".equals(url.getProtocol())) {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>          String toReturn = url.getPath();<a name="line.952"></a>
-<span class="sourceLineNo">953</span>          if (toReturn.startsWith("file:")) {<a name="line.953"></a>
-<span class="sourceLineNo">954</span>            toReturn = toReturn.substring("file:".length());<a name="line.954"></a>
-<span class="sourceLineNo">955</span>          }<a name="line.955"></a>
-<span class="sourceLineNo">956</span>          // URLDecoder is a misnamed class, since it actually decodes<a name="line.956"></a>
-<span class="sourceLineNo">957</span>          // x-www-form-urlencoded MIME type rather than actual<a name="line.957"></a>
-<span class="sourceLineNo">958</span>          // URL encoding (which the file path has). Therefore it would<a name="line.958"></a>
-<span class="sourceLineNo">959</span>          // decode +s to ' 's which is incorrect (spaces are actually<a name="line.959"></a>
-<span class="sourceLineNo">960</span>          // either unencoded or encoded as "%20"). Replace +s first, so<a name="line.960"></a>
-<span class="sourceLineNo">961</span>          // that they are kept sacred during the decoding process.<a name="line.961"></a>
-<span class="sourceLineNo">962</span>          toReturn = toReturn.replaceAll("\\+", "%2B");<a name="line.962"></a>
-<span class="sourceLineNo">963</span>          toReturn = URLDecoder.decode(toReturn, "UTF-8");<a name="line.963"></a>
-<span class="sourceLineNo">964</span>          return toReturn.replaceAll("!.*$", "");<a name="line.964"></a>
-<span class="sourceLineNo">965</span>        }<a name="line.965"></a>
-<span class="sourceLineNo">966</span>      }<a name="line.966"></a>
-<span class="sourceLineNo">967</span>    }<a name="line.967"></a>
-<span class="sourceLineNo">968</span><a name="line.968"></a>
-<span class="sourceLineNo">969</span>    // now look in any jars we've packaged using JarFinder. Returns null when<a name="line.969"></a>
-<span class="sourceLineNo">970</span>    // no jar is found.<a name="line.970"></a>
-<span class="sourceLineNo">971</span>    return packagedClasses.get(class_file);<a name="line.971"></a>
-<span class="sourceLineNo">972</span>  }<a name="line.972"></a>
-<span class="sourceLineNo">973</span><a name="line.973"></a>
-<span class="sourceLineNo">974</span>  /**<a name="line.974"></a>
-<span class="sourceLineNo">975</span>   * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job<a name="line.975"></a>
-<span class="sourceLineNo">976</span>   * configuration contexts (HBASE-8140) and also for testing on MRv2.<a name="line.976"></a>
-<span class="sourceLineNo">977</span>   * check if we have HADOOP-9426.<a name="line.977"></a>
-<span class="sourceLineNo">978</span>   * @param my_class the class to find.<a name="line.978"></a>
-<span class="sourceLineNo">979</span>   * @return a jar file that contains the class, or null.<a name="line.979"></a>
-<span class="sourceLineNo">980</span>   */<a name="line.980"></a>
-<span class="sourceLineNo">981</span>  private static String getJar(Class&lt;?&gt; my_class) {<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    String ret = null;<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    try {<a name="line.983"></a>
-<span class="sourceLineNo">984</span>      ret = JarFinder.getJar(my_class);<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    } catch (Exception e) {<a name="line.985"></a>
-<span class="sourceLineNo">986</span>      // toss all other exceptions, related to reflection failure<a name="line.986"></a>
-<span class="sourceLineNo">987</span>      throw new RuntimeException("getJar invocation failed.", e);<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    }<a name="line.988"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    // PrefixTreeCodec is part of the hbase-prefix-tree module. If not included in MR jobs jar<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    // dependencies, MR jobs that write encoded hfiles will fail.<a name="line.777"></a>
+<span class="sourceLineNo">778</span>    // We used reflection here so to prevent a circular module dependency.<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    // TODO - if we extract the MR into a module, make it depend on hbase-prefix-tree.<a name="line.779"></a>
+<span class="sourceLineNo">780</span>    Class prefixTreeCodecClass = null;<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    try {<a name="line.781"></a>
+<span class="sourceLineNo">782</span>      prefixTreeCodecClass =<a name="line.782"></a>
+<span class="sourceLineNo">783</span>          Class.forName("org.apache.hadoop.hbase.code.prefixtree.PrefixTreeCodec");<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    } catch (ClassNotFoundException e) {<a name="line.784"></a>
+<span class="sourceLineNo">785</span>      // this will show up in unit tests but should not show in real deployments<a name="line.785"></a>
+<span class="sourceLineNo">786</span>      LOG.warn("The hbase-prefix-tree module jar containing PrefixTreeCodec is not present." +<a name="line.786"></a>
+<span class="sourceLineNo">787</span>          "  Continuing without it.");<a name="line.787"></a>
+<span class="sourceLineNo">788</span>    }<a name="line.788"></a>
+<span class="sourceLineNo">789</span><a name="line.789"></a>
+<span class="sourceLineNo">790</span>    addDependencyJars(conf,<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      // explicitly pull a class from each module<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      org.apache.hadoop.hbase.HConstants.class,                      // hbase-common<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      org.apache.hadoop.hbase.client.Put.class,                      // hbase-client<a name="line.794"></a>
+<span class="sourceLineNo">795</span>      org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat<a name="line.795"></a>
+<span class="sourceLineNo">796</span>      org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server<a name="line.796"></a>
+<span class="sourceLineNo">797</span>      prefixTreeCodecClass, //  hbase-prefix-tree (if null will be skipped)<a name="line.797"></a>
+<span class="sourceLineNo">798</span>      // pull necessary dependencies<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      org.apache.zookeeper.ZooKeeper.class,<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      io.netty.channel.Channel.class,<a name="line.800"></a>
+<span class="sourceLineNo">801</span>      com.google.protobuf.Message.class,<a name="line.801"></a>
+<span class="sourceLineNo">802</span>      com.google.common.collect.Lists.class,<a name="line.802"></a>
+<span class="sourceLineNo">803</span>      org.apache.htrace.Trace.class,<a name="line.803"></a>
+<span class="sourceLineNo">804</span>      com.codahale.metrics.MetricRegistry.class);<a name="line.804"></a>
+<span class="sourceLineNo">805</span>  }<a name="line.805"></a>
+<span class="sourceLineNo">806</span><a name="line.806"></a>
+<span class="sourceLineNo">807</span>  /**<a name="line.807"></a>
+<span class="sourceLineNo">808</span>   * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.<a name="line.808"></a>
+<span class="sourceLineNo">809</span>   * Also exposed to shell scripts via `bin/hbase mapredcp`.<a name="line.809"></a>
+<span class="sourceLineNo">810</span>   */<a name="line.810"></a>
+<span class="sourceLineNo">811</span>  public static String buildDependencyClasspath(Configuration conf) {<a name="line.811"></a>
+<span class="sourceLineNo">812</span>    if (conf == null) {<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      throw new IllegalArgumentException("Must provide a configuration object.");<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
+<span class="sourceLineNo">815</span>    Set&lt;String&gt; paths = new HashSet&lt;String&gt;(conf.getStringCollection("tmpjars"));<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    if (paths.size() == 0) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      throw new IllegalArgumentException("Configuration contains no tmpjars.");<a name="line.817"></a>
+<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    StringBuilder sb = new StringBuilder();<a name="line.819"></a>
+<span class="sourceLineNo">820</span>    for (String s : paths) {<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      // entries can take the form 'file:/path/to/file.jar'.<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      int idx = s.indexOf(":");<a name="line.822"></a>
+<span class="sourceLineNo">823</span>      if (idx != -1) s = s.substring(idx + 1);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      if (sb.length() &gt; 0) sb.append(File.pathSeparator);<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      sb.append(s);<a name="line.825"></a>
+<span class="sourceLineNo">826</span>    }<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    return sb.toString();<a name="line.827"></a>
+<span class="sourceLineNo">828</span>  }<a name="line.828"></a>
+<span class="sourceLineNo">829</span><a name="line.829"></a>
+<span class="sourceLineNo">830</span>  /**<a name="line.830"></a>
+<span class="sourceLineNo">831</span>   * Add the HBase dependency jars as well as jars for any of the configured<a name="line.831"></a>
+<span class="sourceLineNo">832</span>   * job classes to the job configuration, so that JobClient will ship them<a name="line.832"></a>
+<span class="sourceLineNo">833</span>   * to the cluster and add them to the DistributedCache.<a name="line.833"></a>
+<span class="sourceLineNo">834</span>   */<a name="line.834"></a>
+<span class="sourceLineNo">835</span>  public static void addDependencyJars(Job job) throws IOException {<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    addHBaseDependencyJars(job.getConfiguration());<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    try {<a name="line.837"></a>
+<span class="sourceLineNo">838</span>      addDependencyJars(job.getConfiguration(),<a name="line.838"></a>
+<span class="sourceLineNo">839</span>          // when making changes here, consider also mapred.TableMapReduceUtil<a name="line.839"></a>
+<span class="sourceLineNo">840</span>          // pull job classes<a name="line.840"></a>
+<span class="sourceLineNo">841</span>          job.getMapOutputKeyClass(),<a name="line.841"></a>
+<span class="sourceLineNo">842</span>          job.getMapOutputValueClass(),<a name="line.842"></a>
+<span class="sourceLineNo">843</span>          job.getInputFormatClass(),<a name="line.843"></a>
+<span class="sourceLineNo">844</span>          job.getOutputKeyClass(),<a name="line.844"></a>
+<span class="sourceLineNo">845</span>          job.getOutputValueClass(),<a name="line.845"></a>
+<span class="sourceLineNo">846</span>          job.getOutputFormatClass(),<a name="line.846"></a>
+<span class="sourceLineNo">847</span>          job.getPartitionerClass(),<a name="line.847"></a>
+<span class="sourceLineNo">848</span>          job.getCombinerClass());<a name="line.848"></a>
+<span class="sourceLineNo">849</span>    } catch (ClassNotFoundException e) {<a name="line.849"></a>
+<span class="sourceLineNo">850</span>      throw new IOException(e);<a name="line.850"></a>
+<span class="sourceLineNo">851</span>    }<a name="line.851"></a>
+<span class="sourceLineNo">852</span>  }<a name="line.852"></a>
+<span class="sourceLineNo">853</span><a name="line.853"></a>
+<span class="sourceLineNo">854</span>  /**<a name="line.854"></a>
+<span class="sourceLineNo">855</span>   * Add the jars containing the given classes to the job's configuration<a name="line.855"></a>
+<span class="sourceLineNo">856</span>   * such that JobClient will ship them to the cluster and add them to<a name="line.856"></a>
+<span class="sourceLineNo">857</span>   * the DistributedCache.<a name="line.857"></a>
+<span class="sourceLineNo">858</span>   */<a name="line.858"></a>
+<span class="sourceLineNo">859</span>  public static void addDependencyJars(Configuration conf,<a name="line.859"></a>
+<span class="sourceLineNo">860</span>      Class&lt;?&gt;... classes) throws IOException {<a name="line.860"></a>
+<span class="sourceLineNo">861</span><a name="line.861"></a>
+<span class="sourceLineNo">862</span>    FileSystem localFs = FileSystem.getLocal(conf);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    Set&lt;String&gt; jars = new HashSet&lt;String&gt;();<a name="line.863"></a>
+<span class="sourceLineNo">864</span>    // Add jars that are already in the tmpjars variable<a name="line.864"></a>
+<span class="sourceLineNo">865</span>    jars.addAll(conf.getStringCollection("tmpjars"));<a name="line.865"></a>
+<span class="sourceLineNo">866</span><a name="line.866"></a>
+<span class="sourceLineNo">867</span>    // add jars as we find them to a map of contents jar name so that we can avoid<a name="line.867"></a>
+<span class="sourceLineNo">868</span>    // creating new jars for classes that have already been packaged.<a name="line.868"></a>
+<span class="sourceLineNo">869</span>    Map&lt;String, String&gt; packagedClasses = new HashMap&lt;String, String&gt;();<a name="line.869"></a>
+<span class="sourceLineNo">870</span><a name="line.870"></a>
+<span class="sourceLineNo">871</span>    // Add jars containing the specified classes<a name="line.871"></a>
+<span class="sourceLineNo">872</span>    for (Class&lt;?&gt; clazz : classes) {<a name="line.872"></a>
+<span class="sourceLineNo">873</span>      if (clazz == null) continue;<a name="line.873"></a>
+<span class="sourceLineNo">874</span><a name="line.874"></a>
+<span class="sourceLineNo">875</span>      Path path = findOrCreateJar(clazz, localFs, packagedClasses);<a name="line.875"></a>
+<span class="sourceLineNo">876</span>      if (path == null) {<a name="line.876"></a>
+<span class="sourceLineNo">877</span>        LOG.warn("Could not find jar for class " + clazz +<a name="line.877"></a>
+<span class="sourceLineNo">878</span>                 " in order to ship it to the cluster.");<a name="line.878"></a>
+<span class="sourceLineNo">879</span>        continue;<a name="line.879"></a>
+<span class="sourceLineNo">880</span>      }<a name="line.880"></a>
+<span class="sourceLineNo">881</span>      if (!localFs.exists(path)) {<a name="line.881"></a>
+<span class="sourceLineNo">882</span>        LOG.warn("Could not validate jar file " + path + " for class "<a name="line.882"></a>
+<span class="sourceLineNo">883</span>                 + clazz);<a name="line.883"></a>
+<span class="sourceLineNo">884</span>        continue;<a name="line.884"></a>
+<span class="sourceLineNo">885</span>      }<a name="line.885"></a>
+<span class="sourceLineNo">886</span>      jars.add(path.toString());<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    }<a name="line.887"></a>
+<span class="sourceLineNo">888</span>    if (jars.isEmpty()) return;<a name="line.888"></a>
+<span class="sourceLineNo">889</span><a name="line.889"></a>
+<span class="sourceLineNo">890</span>    conf.set("tmpjars", StringUtils.arrayToString(jars.toArray(new String[jars.size()])));<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>  /**<a name="line.893"></a>
+<span class="sourceLineNo">894</span>   * Finds the Jar for a class or creates it if it doesn't exist. If the class is in<a name="line.894"></a>
+<span class="sourceLineNo">895</span>   * a directory in the classpath, it creates a Jar on the fly with the<a name="line.895"></a>
+<span class="sourceLineNo">896</span>   * contents of the directory and returns the path to that Jar. If a Jar is<a name="line.896"></a>
+<span class="sourceLineNo">897</span>   * created, it is created in the system temporary directory. Otherwise,<a name="line.897"></a>
+<span class="sourceLineNo">898</span>   * returns an existing jar that contains a class of the same name. Maintains<a name="line.898"></a>
+<span class="sourceLineNo">899</span>   * a mapping from jar contents to the tmp jar created.<a name="line.899"></a>
+<span class="sourceLineNo">900</span>   * @param my_class the class to find.<a name="line.900"></a>
+<span class="sourceLineNo">901</span>   * @param fs the FileSystem with which to qualify the returned path.<a name="line.901"></a>
+<span class="sourceLineNo">902</span>   * @param packagedClasses a map of class name to path.<a name="line.902"></a>
+<span class="sourceLineNo">903</span>   * @return a jar file that contains the class.<a name="line.903"></a>
+<span class="sourceLineNo">904</span>   * @throws IOException<a name="line.904"></a>
+<span class="sourceLineNo">905</span>   */<a name="line.905"></a>
+<span class="sourceLineNo">906</span>  private static Path findOrCreateJar(Class&lt;?&gt; my_class, FileSystem fs,<a name="line.906"></a>
+<span class="sourceLineNo">907</span>      Map&lt;String, String&gt; packagedClasses)<a name="line.907"></a>
+<span class="sourceLineNo">908</span>  throws IOException {<a name="line.908"></a>
+<span class="sourceLineNo">909</span>    // attempt to locate an existing jar for the class.<a name="line.909"></a>
+<span class="sourceLineNo">910</span>    String jar = findContainingJar(my_class, packagedClasses);<a name="line.910"></a>
+<span class="sourceLineNo">911</span>    if (null == jar || jar.isEmpty()) {<a name="line.911"></a>
+<span class="sourceLineNo">912</span>      jar = getJar(my_class);<a name="line.912"></a>
+<span class="sourceLineNo">913</span>      updateMap(jar, packagedClasses);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>    if (null == jar || jar.isEmpty()) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      return null;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    }<a name="line.918"></a>
+<span class="sourceLineNo">919</span><a name="line.919"></a>
+<span class="sourceLineNo">920</span>    LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));<a name="line.920"></a>
+<span class="sourceLineNo">921</span>    return new Path(jar).makeQualified(fs);<a name="line.921"></a>
+<span class="sourceLineNo">922</span>  }<a name="line.922"></a>
+<span class="sourceLineNo">923</span><a name="line.923"></a>
+<span class="sourceLineNo">924</span>  /**<a name="line.924"></a>
+<span class="sourceLineNo">925</span>   * Add entries to &lt;code&gt;packagedClasses&lt;/code&gt; corresponding to class files<a name="line.925"></a>
+<span class="sourceLineNo">926</span>   * contained in &lt;code&gt;jar&lt;/code&gt;.<a name="line.926"></a>
+<span class="sourceLineNo">927</span>   * @param jar The jar who's content to list.<a name="line.927"></a>
+<span class="sourceLineNo">928</span>   * @param packagedClasses map[class -&gt; jar]<a name="line.928"></a>
+<span class="sourceLineNo">929</span>   */<a name="line.929"></a>
+<span class="sourceLineNo">930</span>  private static void updateMap(String jar, Map&lt;String, String&gt; packagedClasses) throws IOException {<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    if (null == jar || jar.isEmpty()) {<a name="line.931"></a>
+<span class="sourceLineNo">932</span>      return;<a name="line.932"></a>
+<span class="sourceLineNo">933</span>    }<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    ZipFile zip = null;<a name="line.934"></a>
+<span class="sourceLineNo">935</span>    try {<a name="line.935"></a>
+<span class="sourceLineNo">936</span>      zip = new ZipFile(jar);<a name="line.936"></a>
+<span class="sourceLineNo">937</span>      for (Enumeration&lt;? extends ZipEntry&gt; iter = zip.entries(); iter.hasMoreElements();) {<a name="line.937"></a>
+<span class="sourceLineNo">938</span>        ZipEntry entry = iter.nextElement();<a name="line.938"></a>
+<span class="sourceLineNo">939</span>        if (entry.getName().endsWith("class")) {<a name="line.939"></a>
+<span class="sourceLineNo">940</span>          packagedClasses.put(entry.getName(), jar);<a name="line.940"></a>
+<span class="sourceLineNo">941</span>        }<a name="line.941"></a>
+<span class="sourceLineNo">942</span>      }<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    } finally {<a name="line.943"></a>
+<span class="sourceLineNo">944</span>      if (null != zip) zip.close();<a name="line.944"></a>
+<span class="sourceLineNo">945</span>    }<a name="line.945"></a>
+<span class="sourceLineNo">946</span>  }<a name="line.946"></a>
+<span class="sourceLineNo">947</span><a name="line.947"></a>
+<span class="sourceLineNo">948</span>  /**<a name="line.948"></a>
+<span class="sourceLineNo">949</span>   * Find a jar that contains a class of the same name, if any. It will return<a name="line.949"></a>
+<span class="sourceLineNo">950</span>   * a jar file, even if that is not the first thing on the class path that<a name="line.950"></a>
+<span class="sourceLineNo">951</span>   * has a class with the same name. Looks first on the classpath and then in<a name="line.951"></a>
+<span class="sourceLineNo">952</span>   * the &lt;code&gt;packagedClasses&lt;/code&gt; map.<a name="line.952"></a>
+<span class="sourceLineNo">953</span>   * @param my_class the class to find.<a name="line.953"></a>
+<span class="sourceLineNo">954</span>   * @return a jar file that contains the class, or null.<a name="line.954"></a>
+<span class="sourceLineNo">955</span>   * @throws IOException<a name="line.955"></a>
+<span class="sourceLineNo">956</span>   */<a name="line.956"></a>
+<span class="sourceLineNo">957</span>  private static String findContainingJar(Class&lt;?&gt; my_class, Map&lt;String, String&gt; packagedClasses)<a name="line.957"></a>
+<span class="sourceLineNo">958</span>      throws IOException {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>    ClassLoader loader = my_class.getClassLoader();<a name="line.959"></a>
+<span class="sourceLineNo">960</span><a name="line.960"></a>
+<span class="sourceLineNo">961</span>    String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span>    if (loader != null) {<a name="line.963"></a>
+<span class="sourceLineNo">964</span>      // first search the classpath<a name="line.964"></a>
+<span class="sourceLineNo">965</span>      for (Enumeration&lt;URL&gt; itr = loader.getResources(class_file); itr.hasMoreElements();) {<a name="line.965"></a>
+<span class="sourceLineNo">966</span>        URL url = itr.nextElement();<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        if ("jar".equals(url.getProtocol())) {<a name="line.967"></a>
+<span class="sourceLineNo">968</span>          String toReturn = url.getPath();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>          if (toReturn.startsWith("file:")) {<a name="line.969"></a>
+<span class="sourceLineNo">970</span>            toReturn = toReturn.substring("file:".length());<a name="line.970"></a>
+<span class="sourceLineNo">971</span>          }<a name="line.971"></a>
+<span class="sourceLineNo">972</span>          // URLDecoder is a misnamed class, since it actually decodes<a name="line.972"></a>
+<span class="sourceLineNo">973</span>          // x-www-form-urlencoded MIME type rather than actual<a name="line.973"></a>
+<span class="sourceLineNo">974</span>          // URL encoding (which the file path has). Therefore it would<a name="line.974"></a>
+<span class="sourceLineNo">975</span>          // decode +s to ' 's which is incorrect (spaces are actually<a name="line.975"></a>
+<span class="sourceLineNo">976</span>          // either unencoded or encoded as "%20"). Replace +s first, so<a name="line.976"></a>
+<span class="sourceLineNo">977</span>          // that they are kept sacred during the decoding process.<a name="line.977"></a>
+<span class="sourceLineNo">978</span>          toReturn = toReturn.replaceAll("\\+", "%2B");<a name="line.978"></a>
+<span class="sourceLineNo">979</span>          toReturn = URLDecoder.decode(toReturn, "UTF-8");<a name="line.979"></a>
+<span class="sourceLineNo">980</span>          return toReturn.replaceAll("!.*$", "");<a name="line.980"></a>
+<span class="sourceLineNo">981</span>        }<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      }<a name="line.982"></a>
+<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>    // now look in any jars we've packaged using JarFinder. Returns null when<a name="line.985"></a>
+<span class="sourceLineNo">986</span>    // no jar is found.<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    return packagedClasses.get(class_file);<a name="line.987"></a>
+<span class="sourceLineNo">988</span>  }<a name="line.988"></a>
 <span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    return ret;<a name="line.990"></a>
-<span class="sourceLineNo">991</span>  }<a name="line.991"></a>
-<span class="sourceLineNo">992</span>}<a name="line.992"></a>
+<span class="sourceLineNo">990</span>  /**<a name="line.990"></a>
+<span class="sourceLineNo">991</span>   * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job<a name="line.991"></a>
+<span class="sourceLineNo">992</span>   * configuration contexts (HBASE-8140) and also for testing on MRv2.<a name="line.992"></a>
+<span class="sourceLineNo">993</span>   * check if we have HADOOP-9426.<a name="line.993"></a>
+<span class="sourceLineNo">994</span>   * @param my_class the class to find.<a name="line.994"></a>
+<span class="sourceLineNo">995</span>   * @return a jar file that contains the class, or null.<a name="line.995"></a>
+<span class="sourceLineNo">996</span>   */<a name="line.996"></a>
+<span class="sourceLineNo">997</span>  private static String getJar(Class&lt;?&gt; my_class) {<a name="line.997"></a>
+<span class="sourceLineNo">998</span>    String ret = null;<a name="line.998"></a>
+<span class="sourceLineNo">999</span>    try {<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>      ret = JarFinder.getJar(my_class);<a name="line.1000"></a>
+<span class="sourceLineNo">1001</span>    } catch (Exception e) {<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span>      // toss all other exceptions, related to reflection failure<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span>      throw new RuntimeException("getJar invocation failed.", e);<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    }<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span><a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>    return ret;<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>  }<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>}<a name="line.1008"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
index 53c9784..bb399c2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html
@@ -72,7 +72,7 @@
 <span class="sourceLineNo">064</span>  protected KeyValueHeap heap;<a name="line.64"></a>
 <span class="sourceLineNo">065</span>  protected boolean cacheBlocks;<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected int countPerRow = 0;<a name="line.67"></a>
+<span class="sourceLineNo">067</span>  protected long countPerRow = 0;<a name="line.67"></a>
 <span class="sourceLineNo">068</span>  protected int storeLimit = -1;<a name="line.68"></a>
 <span class="sourceLineNo">069</span>  protected int storeOffset = 0;<a name="line.69"></a>
 <span class="sourceLineNo">070</span><a name="line.70"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index 53c9784..bb399c2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -72,7 +72,7 @@
 <span class="sourceLineNo">064</span>  protected KeyValueHeap heap;<a name="line.64"></a>
 <span class="sourceLineNo">065</span>  protected boolean cacheBlocks;<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected int countPerRow = 0;<a name="line.67"></a>
+<span class="sourceLineNo">067</span>  protected long countPerRow = 0;<a name="line.67"></a>
 <span class="sourceLineNo">068</span>  protected int storeLimit = -1;<a name="line.68"></a>
 <span class="sourceLineNo">069</span>  protected int storeOffset = 0;<a name="line.69"></a>
 <span class="sourceLineNo">070</span><a name="line.70"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
index 38c4bcd..8979045 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
@@ -293,79 +293,80 @@
 <span class="sourceLineNo">285</span>    }<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>  public static SecretKey createSecretKey(byte[] raw) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return SecretManager.createSecretKey(raw);<a name="line.289"></a>
+<span class="sourceLineNo">288</span>  synchronized long getLastKeyUpdate() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    return lastKeyUpdate;<a name="line.289"></a>
 <span class="sourceLineNo">290</span>  }<a name="line.290"></a>
 <span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  private class LeaderElector extends Thread implements Stoppable {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    private boolean stopped = false;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    private boolean isMaster = false;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    private ZKLeaderManager zkLeader;<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>    public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      setDaemon(true);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      setName("ZKSecretWatcher-leaderElector");<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      zkLeader = new ZKLeaderManager(watcher,<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          Bytes.toBytes(serverName), this);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    public boolean isMaster() {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      return isMaster;<a name="line.307"></a>
+<span class="sourceLineNo">292</span>  public static SecretKey createSecretKey(byte[] raw) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    return SecretManager.createSecretKey(raw);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>  private class LeaderElector extends Thread implements Stoppable {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    private boolean stopped = false;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    private boolean isMaster = false;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    private ZKLeaderManager zkLeader;<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      setDaemon(true);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      setName("ZKSecretWatcher-leaderElector");<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      zkLeader = new ZKLeaderManager(watcher,<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.306"></a>
+<span class="sourceLineNo">307</span>          Bytes.toBytes(serverName), this);<a name="line.307"></a>
 <span class="sourceLineNo">308</span>    }<a name="line.308"></a>
 <span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>    @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    public boolean isStopped() {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      return stopped;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void stop(String reason) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      if (stopped) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        return;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>      stopped = true;<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // prevent further key generation when stopping<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      if (isMaster) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        zkLeader.stepDownAsLeader();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      isMaster = false;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      LOG.info("Stopping leader election, because: "+reason);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      interrupt();<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>    public void run() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      zkLeader.start();<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      zkLeader.waitToBecomeLeader();<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      isMaster = true;<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>      while (!stopped) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        long now = EnvironmentEdgeManager.currentTime();<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span>        // clear any expired<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        removeExpiredKeys();<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        long localLastKeyUpdate;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        synchronized (this) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>          localLastKeyUpdate = lastKeyUpdate;<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        if (localLastKeyUpdate + keyUpdateInterval &lt; now) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>          // roll a new master key<a name="line.346"></a>
-<span class="sourceLineNo">347</span>          rollCurrentKey();<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>        try {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          Thread.sleep(5000);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        } catch (InterruptedException ie) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          if (LOG.isDebugEnabled()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            LOG.debug("Interrupted waiting for next update", ie);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>          }<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    }<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>}<a name="line.360"></a>
+<span class="sourceLineNo">310</span>    public boolean isMaster() {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      return isMaster;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>    @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    public boolean isStopped() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      return stopped;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>    @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public void stop(String reason) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      if (stopped) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        return;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>      stopped = true;<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      // prevent further key generation when stopping<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      if (isMaster) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        zkLeader.stepDownAsLeader();<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      isMaster = false;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      LOG.info("Stopping leader election, because: "+reason);<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      interrupt();<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>    public void run() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      zkLeader.start();<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      zkLeader.waitToBecomeLeader();<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      isMaster = true;<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>      while (!stopped) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>        long now = EnvironmentEdgeManager.currentTime();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>        // clear any expired<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        removeExpiredKeys();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        long localLastKeyUpdate = getLastKeyUpdate();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        if (localLastKeyUpdate + keyUpdateInterval &lt; now) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>          // roll a new master key<a name="line.347"></a>
+<span class="sourceLineNo">348</span>          rollCurrentKey();<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>          Thread.sleep(5000);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        } catch (InterruptedException ie) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>          if (LOG.isDebugEnabled()) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            LOG.debug("Interrupted waiting for next update", ie);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          }<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        }<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      }<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
+<span class="sourceLineNo">360</span>  }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>}<a name="line.361"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
index 38c4bcd..8979045 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
@@ -293,79 +293,80 @@
 <span class="sourceLineNo">285</span>    }<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>  public static SecretKey createSecretKey(byte[] raw) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    return SecretManager.createSecretKey(raw);<a name="line.289"></a>
+<span class="sourceLineNo">288</span>  synchronized long getLastKeyUpdate() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    return lastKeyUpdate;<a name="line.289"></a>
 <span class="sourceLineNo">290</span>  }<a name="line.290"></a>
 <span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span>  private class LeaderElector extends Thread implements Stoppable {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    private boolean stopped = false;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    private boolean isMaster = false;<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    private ZKLeaderManager zkLeader;<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>    public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      setDaemon(true);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      setName("ZKSecretWatcher-leaderElector");<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      zkLeader = new ZKLeaderManager(watcher,<a name="line.301"></a>
-<span class="sourceLineNo">302</span>          ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          Bytes.toBytes(serverName), this);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    public boolean isMaster() {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      return isMaster;<a name="line.307"></a>
+<span class="sourceLineNo">292</span>  public static SecretKey createSecretKey(byte[] raw) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    return SecretManager.createSecretKey(raw);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>  }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>  private class LeaderElector extends Thread implements Stoppable {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    private boolean stopped = false;<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    /** Flag indicating whether we're in charge of rolling/expiring keys */<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    private boolean isMaster = false;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    private ZKLeaderManager zkLeader;<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    public LeaderElector(ZooKeeperWatcher watcher, String serverName) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      setDaemon(true);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      setName("ZKSecretWatcher-leaderElector");<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      zkLeader = new ZKLeaderManager(watcher,<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          ZKUtil.joinZNode(zkWatcher.getRootKeyZNode(), "keymaster"),<a name="line.306"></a>
+<span class="sourceLineNo">307</span>          Bytes.toBytes(serverName), this);<a name="line.307"></a>
 <span class="sourceLineNo">308</span>    }<a name="line.308"></a>
 <span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>    @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    public boolean isStopped() {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      return stopped;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    @Override<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    public void stop(String reason) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      if (stopped) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        return;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>      stopped = true;<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // prevent further key generation when stopping<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      if (isMaster) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        zkLeader.stepDownAsLeader();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      isMaster = false;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      LOG.info("Stopping leader election, because: "+reason);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      interrupt();<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>    public void run() {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      zkLeader.start();<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      zkLeader.waitToBecomeLeader();<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      isMaster = true;<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>      while (!stopped) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        long now = EnvironmentEdgeManager.currentTime();<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span>        // clear any expired<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        removeExpiredKeys();<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        long localLastKeyUpdate;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        synchronized (this) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>          localLastKeyUpdate = lastKeyUpdate;<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        if (localLastKeyUpdate + keyUpdateInterval &lt; now) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>          // roll a new master key<a name="line.346"></a>
-<span class="sourceLineNo">347</span>          rollCurrentKey();<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>        try {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          Thread.sleep(5000);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        } catch (InterruptedException ie) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          if (LOG.isDebugEnabled()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            LOG.debug("Interrupted waiting for next update", ie);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>          }<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    }<a name="line.358"></a>
-<span class="sourceLineNo">359</span>  }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>}<a name="line.360"></a>
+<span class="sourceLineNo">310</span>    public boolean isMaster() {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      return isMaster;<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>    @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    public boolean isStopped() {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      return stopped;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>    @Override<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public void stop(String reason) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      if (stopped) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        return;<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>      stopped = true;<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      // prevent further key generation when stopping<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      if (isMaster) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        zkLeader.stepDownAsLeader();<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      isMaster = false;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      LOG.info("Stopping leader election, because: "+reason);<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      interrupt();<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>    public void run() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      zkLeader.start();<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      zkLeader.waitToBecomeLeader();<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      isMaster = true;<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>      while (!stopped) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>        long now = EnvironmentEdgeManager.currentTime();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>        // clear any expired<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        removeExpiredKeys();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        long localLastKeyUpdate = getLastKeyUpdate();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        if (localLastKeyUpdate + keyUpdateInterval &lt; now) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>          // roll a new master key<a name="line.347"></a>
+<span class="sourceLineNo">348</span>          rollCurrentKey();<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span>        try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>          Thread.sleep(5000);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        } catch (InterruptedException ie) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>          if (LOG.isDebugEnabled()) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            LOG.debug("Interrupted waiting for next update", ie);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          }<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        }<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      }<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
+<span class="sourceLineNo">360</span>  }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>}<a name="line.361"></a>
 
 
 


[05/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
index 5fb70d8..dbf34e2 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
@@ -588,1238 +588,1262 @@
 <span class="sourceLineNo">580</span>    }<a name="line.580"></a>
 <span class="sourceLineNo">581</span>  }<a name="line.581"></a>
 <span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span>  @Test (timeout=180000)<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  public void testHbckAfterRegionMerge() throws Exception {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    TableName table = TableName.valueOf("testMergeRegionFilesInHdfs");<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    Table meta = null;<a name="line.586"></a>
-<span class="sourceLineNo">587</span>    try {<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      // disable CatalogJanitor<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      setupTable(table);<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        // make sure data in regions, if in wal only there is no data loss<a name="line.594"></a>
-<span class="sourceLineNo">595</span>        admin.flush(table);<a name="line.595"></a>
-<span class="sourceLineNo">596</span>        HRegionInfo region1 = rl.getRegionLocation(Bytes.toBytes("A")).getRegionInfo();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        HRegionInfo region2 = rl.getRegionLocation(Bytes.toBytes("B")).getRegionInfo();<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span>        int regionCountBeforeMerge = rl.getAllRegionLocations().size();<a name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>        assertNotEquals(region1, region2);<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>        // do a region merge<a name="line.603"></a>
-<span class="sourceLineNo">604</span>        admin.mergeRegions(region1.getEncodedNameAsBytes(), region2.getEncodedNameAsBytes(), false);<a name="line.604"></a>
-<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span>        // wait until region merged<a name="line.606"></a>
-<span class="sourceLineNo">607</span>        long timeout = System.currentTimeMillis() + 30 * 1000;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>        while (true) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span>          if (rl.getAllRegionLocations().size() &lt; regionCountBeforeMerge) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>            break;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>          } else if (System.currentTimeMillis() &gt; timeout) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span>            fail("Time out waiting on region " + region1.getEncodedName() + " and " + region2<a name="line.612"></a>
-<span class="sourceLineNo">613</span>                .getEncodedName() + " be merged");<a name="line.613"></a>
-<span class="sourceLineNo">614</span>          }<a name="line.614"></a>
-<span class="sourceLineNo">615</span>          Thread.sleep(10);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>        }<a name="line.616"></a>
-<span class="sourceLineNo">617</span><a name="line.617"></a>
-<span class="sourceLineNo">618</span>        assertEquals(ROWKEYS.length, countRows());<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span>        HBaseFsck hbck = doFsck(conf, false);<a name="line.620"></a>
-<span class="sourceLineNo">621</span>        assertNoErrors(hbck); // no errors<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span>    } finally {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(true);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      cleanupTable(table);<a name="line.626"></a>
-<span class="sourceLineNo">627</span>      IOUtils.closeQuietly(meta);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>  }<a name="line.629"></a>
-<span class="sourceLineNo">630</span>  /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * This creates entries in hbase:meta with no hdfs data.  This should cleanly<a name="line.631"></a>
-<span class="sourceLineNo">632</span>   * remove the table.<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   */<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  @Test (timeout=180000)<a name="line.634"></a>
-<span class="sourceLineNo">635</span>  public void testNoHdfsTable() throws Exception {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    TableName table = TableName.valueOf("NoHdfsTable");<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    setupTable(table);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>    assertEquals(ROWKEYS.length, countRows());<a name="line.638"></a>
-<span class="sourceLineNo">639</span><a name="line.639"></a>
-<span class="sourceLineNo">640</span>    // make sure data in regions, if in wal only there is no data loss<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    admin.flush(table);<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>    // Mess it up by deleting hdfs dirs<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(""),<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        Bytes.toBytes("A"), false, false, true); // don't rm meta<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("A"),<a name="line.646"></a>
-<span class="sourceLineNo">647</span>        Bytes.toBytes("B"), false, false, true); // don't rm meta<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"),<a name="line.648"></a>
-<span class="sourceLineNo">649</span>        Bytes.toBytes("C"), false, false, true); // don't rm meta<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("C"),<a name="line.650"></a>
-<span class="sourceLineNo">651</span>        Bytes.toBytes(""), false, false, true); // don't rm meta<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span>    // also remove the table directory in hdfs<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    deleteTableDir(table);<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span>    HBaseFsck hbck = doFsck(conf, false);<a name="line.656"></a>
-<span class="sourceLineNo">657</span>    assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.ORPHAN_TABLE_STATE, });<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    // holes are separate from overlap groups<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    assertEquals(0, hbck.getOverlapGroups(table).size());<a name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span>    // fix hole<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    doFsck(conf, true); // detect dangling regions and remove those<a name="line.664"></a>
-<span class="sourceLineNo">665</span><a name="line.665"></a>
-<span class="sourceLineNo">666</span>    // check that hole fixed<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    assertNoErrors(doFsck(conf,false));<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    assertFalse("Table " + table + " should have been deleted", admin.tableExists(table));<a name="line.668"></a>
-<span class="sourceLineNo">669</span>  }<a name="line.669"></a>
-<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>  /**<a name="line.671"></a>
-<span class="sourceLineNo">672</span>   * when the hbase.version file missing, It is fix the fault.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   */<a name="line.673"></a>
-<span class="sourceLineNo">674</span>  @Test (timeout=180000)<a name="line.674"></a>
-<span class="sourceLineNo">675</span>  public void testNoVersionFile() throws Exception {<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    // delete the hbase.version file<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    FileSystem fs = rootDir.getFileSystem(conf);<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    Path versionFile = new Path(rootDir, HConstants.VERSION_FILE_NAME);<a name="line.679"></a>
-<span class="sourceLineNo">680</span>    fs.delete(versionFile, true);<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span>    // test<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    HBaseFsck hbck = doFsck(conf, false);<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_VERSION_FILE });<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    // fix hbase.version missing<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    doFsck(conf, true);<a name="line.686"></a>
-<span class="sourceLineNo">687</span><a name="line.687"></a>
-<span class="sourceLineNo">688</span>    // no version file fixed<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    assertNoErrors(doFsck(conf, false));<a name="line.689"></a>
-<span class="sourceLineNo">690</span>  }<a name="line.690"></a>
-<span class="sourceLineNo">691</span><a name="line.691"></a>
-<span class="sourceLineNo">692</span>  @Test (timeout=180000)<a name="line.692"></a>
-<span class="sourceLineNo">693</span>  public void testNoTableState() throws Exception {<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    // delete the hbase.version file<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    TableName table =<a name="line.695"></a>
-<span class="sourceLineNo">696</span>        TableName.valueOf("testNoTableState");<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    try {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      setupTable(table);<a name="line.698"></a>
-<span class="sourceLineNo">699</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.699"></a>
-<span class="sourceLineNo">700</span>      admin.flush(table);<a name="line.700"></a>
-<span class="sourceLineNo">701</span><a name="line.701"></a>
-<span class="sourceLineNo">702</span>      MetaTableAccessor.deleteTableState(TEST_UTIL.getConnection(), table);<a name="line.702"></a>
-<span class="sourceLineNo">703</span><a name="line.703"></a>
-<span class="sourceLineNo">704</span>      // test<a name="line.704"></a>
-<span class="sourceLineNo">705</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.705"></a>
-<span class="sourceLineNo">706</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_TABLE_STATE });<a name="line.706"></a>
-<span class="sourceLineNo">707</span>      // fix table state missing<a name="line.707"></a>
-<span class="sourceLineNo">708</span>      doFsck(conf, true);<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>      assertNoErrors(doFsck(conf, false));<a name="line.710"></a>
-<span class="sourceLineNo">711</span>      assertTrue(TEST_UTIL.getHBaseAdmin().isTableEnabled(table));<a name="line.711"></a>
-<span class="sourceLineNo">712</span>    } finally {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>      cleanupTable(table);<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    }<a name="line.714"></a>
-<span class="sourceLineNo">715</span>  }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span>  /**<a name="line.717"></a>
-<span class="sourceLineNo">718</span>   * This creates two tables and mess both of them and fix them one by one<a name="line.718"></a>
-<span class="sourceLineNo">719</span>   */<a name="line.719"></a>
-<span class="sourceLineNo">720</span>  @Test (timeout=180000)<a name="line.720"></a>
-<span class="sourceLineNo">721</span>  public void testFixByTable() throws Exception {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    TableName table1 =<a name="line.722"></a>
-<span class="sourceLineNo">723</span>        TableName.valueOf("testFixByTable1");<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    TableName table2 =<a name="line.724"></a>
-<span class="sourceLineNo">725</span>        TableName.valueOf("testFixByTable2");<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    try {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      setupTable(table1);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      admin.flush(table1);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>      // Mess them up by leaving a hole in the hdfs data<a name="line.730"></a>
-<span class="sourceLineNo">731</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"),<a name="line.731"></a>
-<span class="sourceLineNo">732</span>          Bytes.toBytes("C"), false, false, true); // don't rm meta<a name="line.732"></a>
+<span class="sourceLineNo">583</span>  /**<a name="line.583"></a>
+<span class="sourceLineNo">584</span>   * test region boundaries and make sure store file had been created.<a name="line.584"></a>
+<span class="sourceLineNo">585</span>   * @throws Exception<a name="line.585"></a>
+<span class="sourceLineNo">586</span>   */<a name="line.586"></a>
+<span class="sourceLineNo">587</span>  @Test(timeout = 180000)<a name="line.587"></a>
+<span class="sourceLineNo">588</span>  public void testRegionBoundariesCheckWithFlushTable() throws Exception {<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    HBaseFsck hbck = doFsck(conf, false);<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    assertNoErrors(hbck); // no errors<a name="line.590"></a>
+<span class="sourceLineNo">591</span>    TableName table = TableName.valueOf("testRegionBoundariesCheckWithFlushTable");<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    try {<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      setupTable(table);<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      admin.flush(table);<a name="line.594"></a>
+<span class="sourceLineNo">595</span>      hbck.connect(); // need connection to have access to META<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      hbck.checkRegionBoundaries();<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      assertNoErrors(hbck); // no errors<a name="line.597"></a>
+<span class="sourceLineNo">598</span>    } catch (IllegalArgumentException e) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      if (e.getMessage().endsWith("not a valid DFS filename.")) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span>        fail("Table directory path is not valid." + e.getMessage());<a name="line.600"></a>
+<span class="sourceLineNo">601</span>      }<a name="line.601"></a>
+<span class="sourceLineNo">602</span>    } finally {<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      hbck.close();<a name="line.603"></a>
+<span class="sourceLineNo">604</span>    }<a name="line.604"></a>
+<span class="sourceLineNo">605</span>  }<a name="line.605"></a>
+<span class="sourceLineNo">606</span>  <a name="line.606"></a>
+<span class="sourceLineNo">607</span>  @Test (timeout=180000)<a name="line.607"></a>
+<span class="sourceLineNo">608</span>  public void testHbckAfterRegionMerge() throws Exception {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    TableName table = TableName.valueOf("testMergeRegionFilesInHdfs");<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    Table meta = null;<a name="line.610"></a>
+<span class="sourceLineNo">611</span>    try {<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      // disable CatalogJanitor<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      setupTable(table);<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.617"></a>
+<span class="sourceLineNo">618</span>        // make sure data in regions, if in wal only there is no data loss<a name="line.618"></a>
+<span class="sourceLineNo">619</span>        admin.flush(table);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>        HRegionInfo region1 = rl.getRegionLocation(Bytes.toBytes("A")).getRegionInfo();<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        HRegionInfo region2 = rl.getRegionLocation(Bytes.toBytes("B")).getRegionInfo();<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span>        int regionCountBeforeMerge = rl.getAllRegionLocations().size();<a name="line.623"></a>
+<span class="sourceLineNo">624</span><a name="line.624"></a>
+<span class="sourceLineNo">625</span>        assertNotEquals(region1, region2);<a name="line.625"></a>
+<span class="sourceLineNo">626</span><a name="line.626"></a>
+<span class="sourceLineNo">627</span>        // do a region merge<a name="line.627"></a>
+<span class="sourceLineNo">628</span>        admin.mergeRegions(region1.getEncodedNameAsBytes(), region2.getEncodedNameAsBytes(), false);<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span>        // wait until region merged<a name="line.630"></a>
+<span class="sourceLineNo">631</span>        long timeout = System.currentTimeMillis() + 30 * 1000;<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        while (true) {<a name="line.632"></a>
+<span class="sourceLineNo">633</span>          if (rl.getAllRegionLocations().size() &lt; regionCountBeforeMerge) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>            break;<a name="line.634"></a>
+<span class="sourceLineNo">635</span>          } else if (System.currentTimeMillis() &gt; timeout) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span>            fail("Time out waiting on region " + region1.getEncodedName() + " and " + region2<a name="line.636"></a>
+<span class="sourceLineNo">637</span>                .getEncodedName() + " be merged");<a name="line.637"></a>
+<span class="sourceLineNo">638</span>          }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>          Thread.sleep(10);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        }<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span>        assertEquals(ROWKEYS.length, countRows());<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span>        HBaseFsck hbck = doFsck(conf, false);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>        assertNoErrors(hbck); // no errors<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      }<a name="line.646"></a>
+<span class="sourceLineNo">647</span><a name="line.647"></a>
+<span class="sourceLineNo">648</span>    } finally {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(true);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      cleanupTable(table);<a name="line.650"></a>
+<span class="sourceLineNo">651</span>      IOUtils.closeQuietly(meta);<a name="line.651"></a>
+<span class="sourceLineNo">652</span>    }<a name="line.652"></a>
+<span class="sourceLineNo">653</span>  }<a name="line.653"></a>
+<span class="sourceLineNo">654</span>  /**<a name="line.654"></a>
+<span class="sourceLineNo">655</span>   * This creates entries in hbase:meta with no hdfs data.  This should cleanly<a name="line.655"></a>
+<span class="sourceLineNo">656</span>   * remove the table.<a name="line.656"></a>
+<span class="sourceLineNo">657</span>   */<a name="line.657"></a>
+<span class="sourceLineNo">658</span>  @Test (timeout=180000)<a name="line.658"></a>
+<span class="sourceLineNo">659</span>  public void testNoHdfsTable() throws Exception {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    TableName table = TableName.valueOf("NoHdfsTable");<a name="line.660"></a>
+<span class="sourceLineNo">661</span>    setupTable(table);<a name="line.661"></a>
+<span class="sourceLineNo">662</span>    assertEquals(ROWKEYS.length, countRows());<a name="line.662"></a>
+<span class="sourceLineNo">663</span><a name="line.663"></a>
+<span class="sourceLineNo">664</span>    // make sure data in regions, if in wal only there is no data loss<a name="line.664"></a>
+<span class="sourceLineNo">665</span>    admin.flush(table);<a name="line.665"></a>
+<span class="sourceLineNo">666</span><a name="line.666"></a>
+<span class="sourceLineNo">667</span>    // Mess it up by deleting hdfs dirs<a name="line.667"></a>
+<span class="sourceLineNo">668</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(""),<a name="line.668"></a>
+<span class="sourceLineNo">669</span>        Bytes.toBytes("A"), false, false, true); // don't rm meta<a name="line.669"></a>
+<span class="sourceLineNo">670</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("A"),<a name="line.670"></a>
+<span class="sourceLineNo">671</span>        Bytes.toBytes("B"), false, false, true); // don't rm meta<a name="line.671"></a>
+<span class="sourceLineNo">672</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"),<a name="line.672"></a>
+<span class="sourceLineNo">673</span>        Bytes.toBytes("C"), false, false, true); // don't rm meta<a name="line.673"></a>
+<span class="sourceLineNo">674</span>    deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("C"),<a name="line.674"></a>
+<span class="sourceLineNo">675</span>        Bytes.toBytes(""), false, false, true); // don't rm meta<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span>    // also remove the table directory in hdfs<a name="line.677"></a>
+<span class="sourceLineNo">678</span>    deleteTableDir(table);<a name="line.678"></a>
+<span class="sourceLineNo">679</span><a name="line.679"></a>
+<span class="sourceLineNo">680</span>    HBaseFsck hbck = doFsck(conf, false);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,<a name="line.681"></a>
+<span class="sourceLineNo">682</span>        HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,<a name="line.682"></a>
+<span class="sourceLineNo">683</span>        HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.ORPHAN_TABLE_STATE, });<a name="line.683"></a>
+<span class="sourceLineNo">684</span>    // holes are separate from overlap groups<a name="line.684"></a>
+<span class="sourceLineNo">685</span>    assertEquals(0, hbck.getOverlapGroups(table).size());<a name="line.685"></a>
+<span class="sourceLineNo">686</span><a name="line.686"></a>
+<span class="sourceLineNo">687</span>    // fix hole<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    doFsck(conf, true); // detect dangling regions and remove those<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span>    // check that hole fixed<a name="line.690"></a>
+<span class="sourceLineNo">691</span>    assertNoErrors(doFsck(conf,false));<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    assertFalse("Table " + table + " should have been deleted", admin.tableExists(table));<a name="line.692"></a>
+<span class="sourceLineNo">693</span>  }<a name="line.693"></a>
+<span class="sourceLineNo">694</span><a name="line.694"></a>
+<span class="sourceLineNo">695</span>  /**<a name="line.695"></a>
+<span class="sourceLineNo">696</span>   * when the hbase.version file missing, It is fix the fault.<a name="line.696"></a>
+<span class="sourceLineNo">697</span>   */<a name="line.697"></a>
+<span class="sourceLineNo">698</span>  @Test (timeout=180000)<a name="line.698"></a>
+<span class="sourceLineNo">699</span>  public void testNoVersionFile() throws Exception {<a name="line.699"></a>
+<span class="sourceLineNo">700</span>    // delete the hbase.version file<a name="line.700"></a>
+<span class="sourceLineNo">701</span>    Path rootDir = FSUtils.getRootDir(conf);<a name="line.701"></a>
+<span class="sourceLineNo">702</span>    FileSystem fs = rootDir.getFileSystem(conf);<a name="line.702"></a>
+<span class="sourceLineNo">703</span>    Path versionFile = new Path(rootDir, HConstants.VERSION_FILE_NAME);<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    fs.delete(versionFile, true);<a name="line.704"></a>
+<span class="sourceLineNo">705</span><a name="line.705"></a>
+<span class="sourceLineNo">706</span>    // test<a name="line.706"></a>
+<span class="sourceLineNo">707</span>    HBaseFsck hbck = doFsck(conf, false);<a name="line.707"></a>
+<span class="sourceLineNo">708</span>    assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_VERSION_FILE });<a name="line.708"></a>
+<span class="sourceLineNo">709</span>    // fix hbase.version missing<a name="line.709"></a>
+<span class="sourceLineNo">710</span>    doFsck(conf, true);<a name="line.710"></a>
+<span class="sourceLineNo">711</span><a name="line.711"></a>
+<span class="sourceLineNo">712</span>    // no version file fixed<a name="line.712"></a>
+<span class="sourceLineNo">713</span>    assertNoErrors(doFsck(conf, false));<a name="line.713"></a>
+<span class="sourceLineNo">714</span>  }<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span>  @Test (timeout=180000)<a name="line.716"></a>
+<span class="sourceLineNo">717</span>  public void testNoTableState() throws Exception {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>    // delete the hbase.version file<a name="line.718"></a>
+<span class="sourceLineNo">719</span>    TableName table =<a name="line.719"></a>
+<span class="sourceLineNo">720</span>        TableName.valueOf("testNoTableState");<a name="line.720"></a>
+<span class="sourceLineNo">721</span>    try {<a name="line.721"></a>
+<span class="sourceLineNo">722</span>      setupTable(table);<a name="line.722"></a>
+<span class="sourceLineNo">723</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      admin.flush(table);<a name="line.724"></a>
+<span class="sourceLineNo">725</span><a name="line.725"></a>
+<span class="sourceLineNo">726</span>      MetaTableAccessor.deleteTableState(TEST_UTIL.getConnection(), table);<a name="line.726"></a>
+<span class="sourceLineNo">727</span><a name="line.727"></a>
+<span class="sourceLineNo">728</span>      // test<a name="line.728"></a>
+<span class="sourceLineNo">729</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.729"></a>
+<span class="sourceLineNo">730</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_TABLE_STATE });<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      // fix table state missing<a name="line.731"></a>
+<span class="sourceLineNo">732</span>      doFsck(conf, true);<a name="line.732"></a>
 <span class="sourceLineNo">733</span><a name="line.733"></a>
-<span class="sourceLineNo">734</span>      setupTable(table2);<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.735"></a>
-<span class="sourceLineNo">736</span>      admin.flush(table2);<a name="line.736"></a>
-<span class="sourceLineNo">737</span>      // Mess them up by leaving a hole in the hdfs data<a name="line.737"></a>
-<span class="sourceLineNo">738</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"), Bytes.toBytes("C"), false,<a name="line.738"></a>
-<span class="sourceLineNo">739</span>          false, true); // don't rm meta<a name="line.739"></a>
+<span class="sourceLineNo">734</span>      assertNoErrors(doFsck(conf, false));<a name="line.734"></a>
+<span class="sourceLineNo">735</span>      assertTrue(TEST_UTIL.getHBaseAdmin().isTableEnabled(table));<a name="line.735"></a>
+<span class="sourceLineNo">736</span>    } finally {<a name="line.736"></a>
+<span class="sourceLineNo">737</span>      cleanupTable(table);<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    }<a name="line.738"></a>
+<span class="sourceLineNo">739</span>  }<a name="line.739"></a>
 <span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.741"></a>
-<span class="sourceLineNo">742</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });<a name="line.742"></a>
-<span class="sourceLineNo">743</span><a name="line.743"></a>
-<span class="sourceLineNo">744</span>      // fix hole in table 1<a name="line.744"></a>
-<span class="sourceLineNo">745</span>      doFsck(conf, true, table1);<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      // check that hole in table 1 fixed<a name="line.746"></a>
-<span class="sourceLineNo">747</span>      assertNoErrors(doFsck(conf, false, table1));<a name="line.747"></a>
-<span class="sourceLineNo">748</span>      // check that hole in table 2 still there<a name="line.748"></a>
-<span class="sourceLineNo">749</span>      assertErrors(doFsck(conf, false, table2), new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span>      // fix hole in table 2<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      doFsck(conf, true, table2);<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      // check that hole in both tables fixed<a name="line.753"></a>
-<span class="sourceLineNo">754</span>      assertNoErrors(doFsck(conf, false));<a name="line.754"></a>
-<span class="sourceLineNo">755</span>      assertEquals(ROWKEYS.length - 2, countRows());<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    } finally {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>      cleanupTable(table1);<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      cleanupTable(table2);<a name="line.758"></a>
-<span class="sourceLineNo">759</span>    }<a name="line.759"></a>
-<span class="sourceLineNo">760</span>  }<a name="line.760"></a>
-<span class="sourceLineNo">761</span>  /**<a name="line.761"></a>
-<span class="sourceLineNo">762</span>   * A split parent in meta, in hdfs, and not deployed<a name="line.762"></a>
-<span class="sourceLineNo">763</span>   */<a name="line.763"></a>
-<span class="sourceLineNo">764</span>  @Test (timeout=180000)<a name="line.764"></a>
-<span class="sourceLineNo">765</span>  public void testLingeringSplitParent() throws Exception {<a name="line.765"></a>
-<span class="sourceLineNo">766</span>    TableName table =<a name="line.766"></a>
-<span class="sourceLineNo">767</span>        TableName.valueOf("testLingeringSplitParent");<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    Table meta = null;<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    try {<a name="line.769"></a>
-<span class="sourceLineNo">770</span>      setupTable(table);<a name="line.770"></a>
-<span class="sourceLineNo">771</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.771"></a>
-<span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      admin.flush(table);<a name="line.774"></a>
-<span class="sourceLineNo">775</span><a name="line.775"></a>
-<span class="sourceLineNo">776</span>      HRegionLocation location;<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.777"></a>
-<span class="sourceLineNo">778</span>        location = rl.getRegionLocation(Bytes.toBytes("B"));<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      }<a name="line.779"></a>
-<span class="sourceLineNo">780</span><a name="line.780"></a>
-<span class="sourceLineNo">781</span>      // Delete one region from meta, but not hdfs, unassign it.<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"),<a name="line.782"></a>
-<span class="sourceLineNo">783</span>          Bytes.toBytes("C"), true, true, false);<a name="line.783"></a>
-<span class="sourceLineNo">784</span><a name="line.784"></a>
-<span class="sourceLineNo">785</span>      // Create a new meta entry to fake it as a split parent.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);<a name="line.786"></a>
-<span class="sourceLineNo">787</span>      HRegionInfo hri = location.getRegionInfo();<a name="line.787"></a>
-<span class="sourceLineNo">788</span><a name="line.788"></a>
-<span class="sourceLineNo">789</span>      HRegionInfo a = new HRegionInfo(tbl.getName(),<a name="line.789"></a>
-<span class="sourceLineNo">790</span>          Bytes.toBytes("B"), Bytes.toBytes("BM"));<a name="line.790"></a>
-<span class="sourceLineNo">791</span>      HRegionInfo b = new HRegionInfo(tbl.getName(),<a name="line.791"></a>
-<span class="sourceLineNo">792</span>          Bytes.toBytes("BM"), Bytes.toBytes("C"));<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>      hri.setOffline(true);<a name="line.794"></a>
-<span class="sourceLineNo">795</span>      hri.setSplit(true);<a name="line.795"></a>
+<span class="sourceLineNo">741</span>  /**<a name="line.741"></a>
+<span class="sourceLineNo">742</span>   * This creates two tables and mess both of them and fix them one by one<a name="line.742"></a>
+<span class="sourceLineNo">743</span>   */<a name="line.743"></a>
+<span class="sourceLineNo">744</span>  @Test (timeout=180000)<a name="line.744"></a>
+<span class="sourceLineNo">745</span>  public void testFixByTable() throws Exception {<a name="line.745"></a>
+<span class="sourceLineNo">746</span>    TableName table1 =<a name="line.746"></a>
+<span class="sourceLineNo">747</span>        TableName.valueOf("testFixByTable1");<a name="line.747"></a>
+<span class="sourceLineNo">748</span>    TableName table2 =<a name="line.748"></a>
+<span class="sourceLineNo">749</span>        TableName.valueOf("testFixByTable2");<a name="line.749"></a>
+<span class="sourceLineNo">750</span>    try {<a name="line.750"></a>
+<span class="sourceLineNo">751</span>      setupTable(table1);<a name="line.751"></a>
+<span class="sourceLineNo">752</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.752"></a>
+<span class="sourceLineNo">753</span>      admin.flush(table1);<a name="line.753"></a>
+<span class="sourceLineNo">754</span>      // Mess them up by leaving a hole in the hdfs data<a name="line.754"></a>
+<span class="sourceLineNo">755</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"),<a name="line.755"></a>
+<span class="sourceLineNo">756</span>          Bytes.toBytes("C"), false, false, true); // don't rm meta<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span>      setupTable(table2);<a name="line.758"></a>
+<span class="sourceLineNo">759</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      admin.flush(table2);<a name="line.760"></a>
+<span class="sourceLineNo">761</span>      // Mess them up by leaving a hole in the hdfs data<a name="line.761"></a>
+<span class="sourceLineNo">762</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"), Bytes.toBytes("C"), false,<a name="line.762"></a>
+<span class="sourceLineNo">763</span>          false, true); // don't rm meta<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });<a name="line.766"></a>
+<span class="sourceLineNo">767</span><a name="line.767"></a>
+<span class="sourceLineNo">768</span>      // fix hole in table 1<a name="line.768"></a>
+<span class="sourceLineNo">769</span>      doFsck(conf, true, table1);<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      // check that hole in table 1 fixed<a name="line.770"></a>
+<span class="sourceLineNo">771</span>      assertNoErrors(doFsck(conf, false, table1));<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      // check that hole in table 2 still there<a name="line.772"></a>
+<span class="sourceLineNo">773</span>      assertErrors(doFsck(conf, false, table2), new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });<a name="line.773"></a>
+<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">775</span>      // fix hole in table 2<a name="line.775"></a>
+<span class="sourceLineNo">776</span>      doFsck(conf, true, table2);<a name="line.776"></a>
+<span class="sourceLineNo">777</span>      // check that hole in both tables fixed<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      assertNoErrors(doFsck(conf, false));<a name="line.778"></a>
+<span class="sourceLineNo">779</span>      assertEquals(ROWKEYS.length - 2, countRows());<a name="line.779"></a>
+<span class="sourceLineNo">780</span>    } finally {<a name="line.780"></a>
+<span class="sourceLineNo">781</span>      cleanupTable(table1);<a name="line.781"></a>
+<span class="sourceLineNo">782</span>      cleanupTable(table2);<a name="line.782"></a>
+<span class="sourceLineNo">783</span>    }<a name="line.783"></a>
+<span class="sourceLineNo">784</span>  }<a name="line.784"></a>
+<span class="sourceLineNo">785</span>  /**<a name="line.785"></a>
+<span class="sourceLineNo">786</span>   * A split parent in meta, in hdfs, and not deployed<a name="line.786"></a>
+<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
+<span class="sourceLineNo">788</span>  @Test (timeout=180000)<a name="line.788"></a>
+<span class="sourceLineNo">789</span>  public void testLingeringSplitParent() throws Exception {<a name="line.789"></a>
+<span class="sourceLineNo">790</span>    TableName table =<a name="line.790"></a>
+<span class="sourceLineNo">791</span>        TableName.valueOf("testLingeringSplitParent");<a name="line.791"></a>
+<span class="sourceLineNo">792</span>    Table meta = null;<a name="line.792"></a>
+<span class="sourceLineNo">793</span>    try {<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      setupTable(table);<a name="line.794"></a>
+<span class="sourceLineNo">795</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.795"></a>
 <span class="sourceLineNo">796</span><a name="line.796"></a>
-<span class="sourceLineNo">797</span>      MetaTableAccessor.addRegionToMeta(meta, hri, a, b);<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      meta.close();<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      admin.flush(TableName.META_TABLE_NAME);<a name="line.799"></a>
-<span class="sourceLineNo">800</span><a name="line.800"></a>
-<span class="sourceLineNo">801</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.801"></a>
-<span class="sourceLineNo">802</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.802"></a>
-<span class="sourceLineNo">803</span>          HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});<a name="line.803"></a>
+<span class="sourceLineNo">797</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.797"></a>
+<span class="sourceLineNo">798</span>      admin.flush(table);<a name="line.798"></a>
+<span class="sourceLineNo">799</span><a name="line.799"></a>
+<span class="sourceLineNo">800</span>      HRegionLocation location;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.801"></a>
+<span class="sourceLineNo">802</span>        location = rl.getRegionLocation(Bytes.toBytes("B"));<a name="line.802"></a>
+<span class="sourceLineNo">803</span>      }<a name="line.803"></a>
 <span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span>      // regular repair cannot fix lingering split parent<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      hbck = doFsck(conf, true);<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.807"></a>
-<span class="sourceLineNo">808</span>          HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });<a name="line.808"></a>
-<span class="sourceLineNo">809</span>      assertFalse(hbck.shouldRerun());<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      hbck = doFsck(conf, false);<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.811"></a>
-<span class="sourceLineNo">812</span>          HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span>      // fix lingering split parent<a name="line.814"></a>
-<span class="sourceLineNo">815</span>      hbck = new HBaseFsck(conf, hbfsckExecutorService);<a name="line.815"></a>
-<span class="sourceLineNo">816</span>      hbck.connect();<a name="line.816"></a>
-<span class="sourceLineNo">817</span>      HBaseFsck.setDisplayFullReport(); // i.e. -details<a name="line.817"></a>
-<span class="sourceLineNo">818</span>      hbck.setTimeLag(0);<a name="line.818"></a>
-<span class="sourceLineNo">819</span>      hbck.setFixSplitParents(true);<a name="line.819"></a>
-<span class="sourceLineNo">820</span>      hbck.onlineHbck();<a name="line.820"></a>
-<span class="sourceLineNo">821</span>      assertTrue(hbck.shouldRerun());<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      hbck.close();<a name="line.822"></a>
-<span class="sourceLineNo">823</span><a name="line.823"></a>
-<span class="sourceLineNo">824</span>      Get get = new Get(hri.getRegionName());<a name="line.824"></a>
-<span class="sourceLineNo">825</span>      Result result = meta.get(get);<a name="line.825"></a>
-<span class="sourceLineNo">826</span>      assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,<a name="line.826"></a>
-<span class="sourceLineNo">827</span>          HConstants.SPLITA_QUALIFIER).isEmpty());<a name="line.827"></a>
-<span class="sourceLineNo">828</span>      assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,<a name="line.828"></a>
-<span class="sourceLineNo">829</span>          HConstants.SPLITB_QUALIFIER).isEmpty());<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      admin.flush(TableName.META_TABLE_NAME);<a name="line.830"></a>
-<span class="sourceLineNo">831</span><a name="line.831"></a>
-<span class="sourceLineNo">832</span>      // fix other issues<a name="line.832"></a>
-<span class="sourceLineNo">833</span>      doFsck(conf, true);<a name="line.833"></a>
-<span class="sourceLineNo">834</span><a name="line.834"></a>
-<span class="sourceLineNo">835</span>      // check that all are fixed<a name="line.835"></a>
-<span class="sourceLineNo">836</span>      assertNoErrors(doFsck(conf, false));<a name="line.836"></a>
-<span class="sourceLineNo">837</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.837"></a>
-<span class="sourceLineNo">838</span>    } finally {<a name="line.838"></a>
-<span class="sourceLineNo">839</span>      cleanupTable(table);<a name="line.839"></a>
-<span class="sourceLineNo">840</span>      IOUtils.closeQuietly(meta);<a name="line.840"></a>
-<span class="sourceLineNo">841</span>    }<a name="line.841"></a>
-<span class="sourceLineNo">842</span>  }<a name="line.842"></a>
-<span class="sourceLineNo">843</span><a name="line.843"></a>
-<span class="sourceLineNo">844</span>  /**<a name="line.844"></a>
-<span class="sourceLineNo">845</span>   * Tests that LINGERING_SPLIT_PARENT is not erroneously reported for<a name="line.845"></a>
-<span class="sourceLineNo">846</span>   * valid cases where the daughters are there.<a name="line.846"></a>
-<span class="sourceLineNo">847</span>   */<a name="line.847"></a>
-<span class="sourceLineNo">848</span>  @Test (timeout=180000)<a name="line.848"></a>
-<span class="sourceLineNo">849</span>  public void testValidLingeringSplitParent() throws Exception {<a name="line.849"></a>
-<span class="sourceLineNo">850</span>    TableName table =<a name="line.850"></a>
-<span class="sourceLineNo">851</span>        TableName.valueOf("testLingeringSplitParent");<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    Table meta = null;<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    try {<a name="line.853"></a>
-<span class="sourceLineNo">854</span>      setupTable(table);<a name="line.854"></a>
-<span class="sourceLineNo">855</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.855"></a>
-<span class="sourceLineNo">856</span><a name="line.856"></a>
-<span class="sourceLineNo">857</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.857"></a>
-<span class="sourceLineNo">858</span>      admin.flush(table);<a name="line.858"></a>
-<span class="sourceLineNo">859</span><a name="line.859"></a>
-<span class="sourceLineNo">860</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.860"></a>
-<span class="sourceLineNo">861</span>        HRegionLocation location = rl.getRegionLocation(Bytes.toBytes("B"));<a name="line.861"></a>
-<span class="sourceLineNo">862</span><a name="line.862"></a>
-<span class="sourceLineNo">863</span>        meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);<a name="line.863"></a>
-<span class="sourceLineNo">864</span>        HRegionInfo hri = location.getRegionInfo();<a name="line.864"></a>
-<span class="sourceLineNo">865</span><a name="line.865"></a>
-<span class="sourceLineNo">866</span>        // do a regular split<a name="line.866"></a>
-<span class="sourceLineNo">867</span>        byte[] regionName = location.getRegionInfo().getRegionName();<a name="line.867"></a>
-<span class="sourceLineNo">868</span>        admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM"));<a name="line.868"></a>
-<span class="sourceLineNo">869</span>        TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, true);<a name="line.869"></a>
-<span class="sourceLineNo">870</span><a name="line.870"></a>
-<span class="sourceLineNo">871</span>        // TODO: fixHdfsHoles does not work against splits, since the parent dir lingers on<a name="line.871"></a>
-<span class="sourceLineNo">872</span>        // for some time until children references are deleted. HBCK erroneously sees this as<a name="line.872"></a>
-<span class="sourceLineNo">873</span>        // overlapping regions<a name="line.873"></a>
-<span class="sourceLineNo">874</span>        HBaseFsck hbck = doFsck(conf, true, true, false, false, false, true, true, true, false,<a name="line.874"></a>
-<span class="sourceLineNo">875</span>            false, false, null);<a name="line.875"></a>
-<span class="sourceLineNo">876</span>        assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {}); //no LINGERING_SPLIT_PARENT reported<a name="line.876"></a>
-<span class="sourceLineNo">877</span><a name="line.877"></a>
-<span class="sourceLineNo">878</span>        // assert that the split hbase:meta entry is still there.<a name="line.878"></a>
-<span class="sourceLineNo">879</span>        Get get = new Get(hri.getRegionName());<a name="line.879"></a>
-<span class="sourceLineNo">880</span>        Result result = meta.get(get);<a name="line.880"></a>
-<span class="sourceLineNo">881</span>        assertNotNull(result);<a name="line.881"></a>
-<span class="sourceLineNo">882</span>        assertNotNull(MetaTableAccessor.getHRegionInfo(result));<a name="line.882"></a>
+<span class="sourceLineNo">805</span>      // Delete one region from meta, but not hdfs, unassign it.<a name="line.805"></a>
+<span class="sourceLineNo">806</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"),<a name="line.806"></a>
+<span class="sourceLineNo">807</span>          Bytes.toBytes("C"), true, true, false);<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>      // Create a new meta entry to fake it as a split parent.<a name="line.809"></a>
+<span class="sourceLineNo">810</span>      meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);<a name="line.810"></a>
+<span class="sourceLineNo">811</span>      HRegionInfo hri = location.getRegionInfo();<a name="line.811"></a>
+<span class="sourceLineNo">812</span><a name="line.812"></a>
+<span class="sourceLineNo">813</span>      HRegionInfo a = new HRegionInfo(tbl.getName(),<a name="line.813"></a>
+<span class="sourceLineNo">814</span>          Bytes.toBytes("B"), Bytes.toBytes("BM"));<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      HRegionInfo b = new HRegionInfo(tbl.getName(),<a name="line.815"></a>
+<span class="sourceLineNo">816</span>          Bytes.toBytes("BM"), Bytes.toBytes("C"));<a name="line.816"></a>
+<span class="sourceLineNo">817</span><a name="line.817"></a>
+<span class="sourceLineNo">818</span>      hri.setOffline(true);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>      hri.setSplit(true);<a name="line.819"></a>
+<span class="sourceLineNo">820</span><a name="line.820"></a>
+<span class="sourceLineNo">821</span>      MetaTableAccessor.addRegionToMeta(meta, hri, a, b);<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      meta.close();<a name="line.822"></a>
+<span class="sourceLineNo">823</span>      admin.flush(TableName.META_TABLE_NAME);<a name="line.823"></a>
+<span class="sourceLineNo">824</span><a name="line.824"></a>
+<span class="sourceLineNo">825</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.825"></a>
+<span class="sourceLineNo">826</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.826"></a>
+<span class="sourceLineNo">827</span>          HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});<a name="line.827"></a>
+<span class="sourceLineNo">828</span><a name="line.828"></a>
+<span class="sourceLineNo">829</span>      // regular repair cannot fix lingering split parent<a name="line.829"></a>
+<span class="sourceLineNo">830</span>      hbck = doFsck(conf, true);<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.831"></a>
+<span class="sourceLineNo">832</span>          HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });<a name="line.832"></a>
+<span class="sourceLineNo">833</span>      assertFalse(hbck.shouldRerun());<a name="line.833"></a>
+<span class="sourceLineNo">834</span>      hbck = doFsck(conf, false);<a name="line.834"></a>
+<span class="sourceLineNo">835</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.835"></a>
+<span class="sourceLineNo">836</span>          HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});<a name="line.836"></a>
+<span class="sourceLineNo">837</span><a name="line.837"></a>
+<span class="sourceLineNo">838</span>      // fix lingering split parent<a name="line.838"></a>
+<span class="sourceLineNo">839</span>      hbck = new HBaseFsck(conf, hbfsckExecutorService);<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      hbck.connect();<a name="line.840"></a>
+<span class="sourceLineNo">841</span>      HBaseFsck.setDisplayFullReport(); // i.e. -details<a name="line.841"></a>
+<span class="sourceLineNo">842</span>      hbck.setTimeLag(0);<a name="line.842"></a>
+<span class="sourceLineNo">843</span>      hbck.setFixSplitParents(true);<a name="line.843"></a>
+<span class="sourceLineNo">844</span>      hbck.onlineHbck();<a name="line.844"></a>
+<span class="sourceLineNo">845</span>      assertTrue(hbck.shouldRerun());<a name="line.845"></a>
+<span class="sourceLineNo">846</span>      hbck.close();<a name="line.846"></a>
+<span class="sourceLineNo">847</span><a name="line.847"></a>
+<span class="sourceLineNo">848</span>      Get get = new Get(hri.getRegionName());<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      Result result = meta.get(get);<a name="line.849"></a>
+<span class="sourceLineNo">850</span>      assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,<a name="line.850"></a>
+<span class="sourceLineNo">851</span>          HConstants.SPLITA_QUALIFIER).isEmpty());<a name="line.851"></a>
+<span class="sourceLineNo">852</span>      assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,<a name="line.852"></a>
+<span class="sourceLineNo">853</span>          HConstants.SPLITB_QUALIFIER).isEmpty());<a name="line.853"></a>
+<span class="sourceLineNo">854</span>      admin.flush(TableName.META_TABLE_NAME);<a name="line.854"></a>
+<span class="sourceLineNo">855</span><a name="line.855"></a>
+<span class="sourceLineNo">856</span>      // fix other issues<a name="line.856"></a>
+<span class="sourceLineNo">857</span>      doFsck(conf, true);<a name="line.857"></a>
+<span class="sourceLineNo">858</span><a name="line.858"></a>
+<span class="sourceLineNo">859</span>      // check that all are fixed<a name="line.859"></a>
+<span class="sourceLineNo">860</span>      assertNoErrors(doFsck(conf, false));<a name="line.860"></a>
+<span class="sourceLineNo">861</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.861"></a>
+<span class="sourceLineNo">862</span>    } finally {<a name="line.862"></a>
+<span class="sourceLineNo">863</span>      cleanupTable(table);<a name="line.863"></a>
+<span class="sourceLineNo">864</span>      IOUtils.closeQuietly(meta);<a name="line.864"></a>
+<span class="sourceLineNo">865</span>    }<a name="line.865"></a>
+<span class="sourceLineNo">866</span>  }<a name="line.866"></a>
+<span class="sourceLineNo">867</span><a name="line.867"></a>
+<span class="sourceLineNo">868</span>  /**<a name="line.868"></a>
+<span class="sourceLineNo">869</span>   * Tests that LINGERING_SPLIT_PARENT is not erroneously reported for<a name="line.869"></a>
+<span class="sourceLineNo">870</span>   * valid cases where the daughters are there.<a name="line.870"></a>
+<span class="sourceLineNo">871</span>   */<a name="line.871"></a>
+<span class="sourceLineNo">872</span>  @Test (timeout=180000)<a name="line.872"></a>
+<span class="sourceLineNo">873</span>  public void testValidLingeringSplitParent() throws Exception {<a name="line.873"></a>
+<span class="sourceLineNo">874</span>    TableName table =<a name="line.874"></a>
+<span class="sourceLineNo">875</span>        TableName.valueOf("testLingeringSplitParent");<a name="line.875"></a>
+<span class="sourceLineNo">876</span>    Table meta = null;<a name="line.876"></a>
+<span class="sourceLineNo">877</span>    try {<a name="line.877"></a>
+<span class="sourceLineNo">878</span>      setupTable(table);<a name="line.878"></a>
+<span class="sourceLineNo">879</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.879"></a>
+<span class="sourceLineNo">880</span><a name="line.880"></a>
+<span class="sourceLineNo">881</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.881"></a>
+<span class="sourceLineNo">882</span>      admin.flush(table);<a name="line.882"></a>
 <span class="sourceLineNo">883</span><a name="line.883"></a>
-<span class="sourceLineNo">884</span>        assertEquals(ROWKEYS.length, countRows());<a name="line.884"></a>
-<span class="sourceLineNo">885</span><a name="line.885"></a>
-<span class="sourceLineNo">886</span>        // assert that we still have the split regions<a name="line.886"></a>
-<span class="sourceLineNo">887</span>        assertEquals(rl.getStartKeys().length, SPLITS.length + 1 + 1); //SPLITS + 1 is # regions<a name="line.887"></a>
-<span class="sourceLineNo">888</span>        // pre-split.<a name="line.888"></a>
-<span class="sourceLineNo">889</span>        assertNoErrors(doFsck(conf, false));<a name="line.889"></a>
-<span class="sourceLineNo">890</span>      }<a name="line.890"></a>
-<span class="sourceLineNo">891</span>    } finally {<a name="line.891"></a>
-<span class="sourceLineNo">892</span>      cleanupTable(table);<a name="line.892"></a>
-<span class="sourceLineNo">893</span>      IOUtils.closeQuietly(meta);<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    }<a name="line.894"></a>
-<span class="sourceLineNo">895</span>  }<a name="line.895"></a>
-<span class="sourceLineNo">896</span><a name="line.896"></a>
-<span class="sourceLineNo">897</span>  /**<a name="line.897"></a>
-<span class="sourceLineNo">898</span>   * Split crashed after write to hbase:meta finished for the parent region, but<a name="line.898"></a>
-<span class="sourceLineNo">899</span>   * failed to write daughters (pre HBASE-7721 codebase)<a name="line.899"></a>
-<span class="sourceLineNo">900</span>   */<a name="line.900"></a>
-<span class="sourceLineNo">901</span>  @Test(timeout=75000)<a name="line.901"></a>
-<span class="sourceLineNo">902</span>  public void testSplitDaughtersNotInMeta() throws Exception {<a name="line.902"></a>
-<span class="sourceLineNo">903</span>    TableName table = TableName.valueOf("testSplitdaughtersNotInMeta");<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    Table meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    try {<a name="line.905"></a>
-<span class="sourceLineNo">906</span>      setupTable(table);<a name="line.906"></a>
-<span class="sourceLineNo">907</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.907"></a>
-<span class="sourceLineNo">908</span><a name="line.908"></a>
-<span class="sourceLineNo">909</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.909"></a>
-<span class="sourceLineNo">910</span>      admin.flush(table);<a name="line.910"></a>
-<span class="sourceLineNo">911</span><a name="line.911"></a>
-<span class="sourceLineNo">912</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.912"></a>
-<span class="sourceLineNo">913</span>        HRegionLocation location = rl.getRegionLocation(Bytes.toBytes("B"));<a name="line.913"></a>
-<span class="sourceLineNo">914</span><a name="line.914"></a>
-<span class="sourceLineNo">915</span>        HRegionInfo hri = location.getRegionInfo();<a name="line.915"></a>
-<span class="sourceLineNo">916</span><a name="line.916"></a>
-<span class="sourceLineNo">917</span>        // do a regular split<a name="line.917"></a>
-<span class="sourceLineNo">918</span>        byte[] regionName = location.getRegionInfo().getRegionName();<a name="line.918"></a>
-<span class="sourceLineNo">919</span>        admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM"));<a name="line.919"></a>
-<span class="sourceLineNo">920</span>        TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, true);<a name="line.920"></a>
-<span class="sourceLineNo">921</span><a name="line.921"></a>
-<span class="sourceLineNo">922</span>        PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(<a name="line.922"></a>
-<span class="sourceLineNo">923</span>            meta.get(new Get(regionName)));<a name="line.923"></a>
-<span class="sourceLineNo">924</span><a name="line.924"></a>
-<span class="sourceLineNo">925</span>        // Delete daughter regions from meta, but not hdfs, unassign it.<a name="line.925"></a>
-<span class="sourceLineNo">926</span><a name="line.926"></a>
-<span class="sourceLineNo">927</span>        ServerName firstSN =<a name="line.927"></a>
-<span class="sourceLineNo">928</span>            rl.getRegionLocation(daughters.getFirst().getStartKey()).getServerName();<a name="line.928"></a>
-<span class="sourceLineNo">929</span>        ServerName secondSN =<a name="line.929"></a>
-<span class="sourceLineNo">930</span>            rl.getRegionLocation(daughters.getSecond().getStartKey()).getServerName();<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span>        undeployRegion(connection, firstSN, daughters.getFirst());<a name="line.932"></a>
-<span class="sourceLineNo">933</span>        undeployRegion(connection, secondSN, daughters.getSecond());<a name="line.933"></a>
-<span class="sourceLineNo">934</span><a name="line.934"></a>
-<span class="sourceLineNo">935</span>        List&lt;Delete&gt; deletes = new ArrayList&lt;&gt;();<a name="line.935"></a>
-<span class="sourceLineNo">936</span>        deletes.add(new Delete(daughters.getFirst().getRegionName()));<a name="line.936"></a>
-<span class="sourceLineNo">937</span>        deletes.add(new Delete(daughters.getSecond().getRegionName()));<a name="line.937"></a>
-<span class="sourceLineNo">938</span>        meta.delete(deletes);<a name="line.938"></a>
-<span class="sourceLineNo">939</span><a name="line.939"></a>
-<span class="sourceLineNo">940</span>        // Remove daughters from regionStates<a name="line.940"></a>
-<span class="sourceLineNo">941</span>        RegionStates regionStates = TEST_UTIL.getMiniHBaseCluster().getMaster().<a name="line.941"></a>
-<span class="sourceLineNo">942</span>            getAssignmentManager().getRegionStates();<a name="line.942"></a>
-<span class="sourceLineNo">943</span>        regionStates.deleteRegion(daughters.getFirst());<a name="line.943"></a>
-<span class="sourceLineNo">944</span>        regionStates.deleteRegion(daughters.getSecond());<a name="line.944"></a>
+<span class="sourceLineNo">884</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.884"></a>
+<span class="sourceLineNo">885</span>        HRegionLocation location = rl.getRegionLocation(Bytes.toBytes("B"));<a name="line.885"></a>
+<span class="sourceLineNo">886</span><a name="line.886"></a>
+<span class="sourceLineNo">887</span>        meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);<a name="line.887"></a>
+<span class="sourceLineNo">888</span>        HRegionInfo hri = location.getRegionInfo();<a name="line.888"></a>
+<span class="sourceLineNo">889</span><a name="line.889"></a>
+<span class="sourceLineNo">890</span>        // do a regular split<a name="line.890"></a>
+<span class="sourceLineNo">891</span>        byte[] regionName = location.getRegionInfo().getRegionName();<a name="line.891"></a>
+<span class="sourceLineNo">892</span>        admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM"));<a name="line.892"></a>
+<span class="sourceLineNo">893</span>        TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, true);<a name="line.893"></a>
+<span class="sourceLineNo">894</span><a name="line.894"></a>
+<span class="sourceLineNo">895</span>        // TODO: fixHdfsHoles does not work against splits, since the parent dir lingers on<a name="line.895"></a>
+<span class="sourceLineNo">896</span>        // for some time until children references are deleted. HBCK erroneously sees this as<a name="line.896"></a>
+<span class="sourceLineNo">897</span>        // overlapping regions<a name="line.897"></a>
+<span class="sourceLineNo">898</span>        HBaseFsck hbck = doFsck(conf, true, true, false, false, false, true, true, true, false,<a name="line.898"></a>
+<span class="sourceLineNo">899</span>            false, false, null);<a name="line.899"></a>
+<span class="sourceLineNo">900</span>        assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {}); //no LINGERING_SPLIT_PARENT reported<a name="line.900"></a>
+<span class="sourceLineNo">901</span><a name="line.901"></a>
+<span class="sourceLineNo">902</span>        // assert that the split hbase:meta entry is still there.<a name="line.902"></a>
+<span class="sourceLineNo">903</span>        Get get = new Get(hri.getRegionName());<a name="line.903"></a>
+<span class="sourceLineNo">904</span>        Result result = meta.get(get);<a name="line.904"></a>
+<span class="sourceLineNo">905</span>        assertNotNull(result);<a name="line.905"></a>
+<span class="sourceLineNo">906</span>        assertNotNull(MetaTableAccessor.getHRegionInfo(result));<a name="line.906"></a>
+<span class="sourceLineNo">907</span><a name="line.907"></a>
+<span class="sourceLineNo">908</span>        assertEquals(ROWKEYS.length, countRows());<a name="line.908"></a>
+<span class="sourceLineNo">909</span><a name="line.909"></a>
+<span class="sourceLineNo">910</span>        // assert that we still have the split regions<a name="line.910"></a>
+<span class="sourceLineNo">911</span>        assertEquals(rl.getStartKeys().length, SPLITS.length + 1 + 1); //SPLITS + 1 is # regions<a name="line.911"></a>
+<span class="sourceLineNo">912</span>        // pre-split.<a name="line.912"></a>
+<span class="sourceLineNo">913</span>        assertNoErrors(doFsck(conf, false));<a name="line.913"></a>
+<span class="sourceLineNo">914</span>      }<a name="line.914"></a>
+<span class="sourceLineNo">915</span>    } finally {<a name="line.915"></a>
+<span class="sourceLineNo">916</span>      cleanupTable(table);<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      IOUtils.closeQuietly(meta);<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    }<a name="line.918"></a>
+<span class="sourceLineNo">919</span>  }<a name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>  /**<a name="line.921"></a>
+<span class="sourceLineNo">922</span>   * Split crashed after write to hbase:meta finished for the parent region, but<a name="line.922"></a>
+<span class="sourceLineNo">923</span>   * failed to write daughters (pre HBASE-7721 codebase)<a name="line.923"></a>
+<span class="sourceLineNo">924</span>   */<a name="line.924"></a>
+<span class="sourceLineNo">925</span>  @Test(timeout=75000)<a name="line.925"></a>
+<span class="sourceLineNo">926</span>  public void testSplitDaughtersNotInMeta() throws Exception {<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    TableName table = TableName.valueOf("testSplitdaughtersNotInMeta");<a name="line.927"></a>
+<span class="sourceLineNo">928</span>    Table meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);<a name="line.928"></a>
+<span class="sourceLineNo">929</span>    try {<a name="line.929"></a>
+<span class="sourceLineNo">930</span>      setupTable(table);<a name="line.930"></a>
+<span class="sourceLineNo">931</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span>      // make sure data in regions, if in wal only there is no data loss<a name="line.933"></a>
+<span class="sourceLineNo">934</span>      admin.flush(table);<a name="line.934"></a>
+<span class="sourceLineNo">935</span><a name="line.935"></a>
+<span class="sourceLineNo">936</span>      try(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {<a name="line.936"></a>
+<span class="sourceLineNo">937</span>        HRegionLocation location = rl.getRegionLocation(Bytes.toBytes("B"));<a name="line.937"></a>
+<span class="sourceLineNo">938</span><a name="line.938"></a>
+<span class="sourceLineNo">939</span>        HRegionInfo hri = location.getRegionInfo();<a name="line.939"></a>
+<span class="sourceLineNo">940</span><a name="line.940"></a>
+<span class="sourceLineNo">941</span>        // do a regular split<a name="line.941"></a>
+<span class="sourceLineNo">942</span>        byte[] regionName = location.getRegionInfo().getRegionName();<a name="line.942"></a>
+<span class="sourceLineNo">943</span>        admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM"));<a name="line.943"></a>
+<span class="sourceLineNo">944</span>        TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, true);<a name="line.944"></a>
 <span class="sourceLineNo">945</span><a name="line.945"></a>
-<span class="sourceLineNo">946</span>        HBaseFsck hbck = doFsck(conf, false);<a name="line.946"></a>
-<span class="sourceLineNo">947</span>        assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.947"></a>
-<span class="sourceLineNo">948</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.948"></a>
-<span class="sourceLineNo">949</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.949"></a>
-<span class="sourceLineNo">950</span>            HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN }); //no LINGERING_SPLIT_PARENT<a name="line.950"></a>
-<span class="sourceLineNo">951</span><a name="line.951"></a>
-<span class="sourceLineNo">952</span>        // now fix it. The fix should not revert the region split, but add daughters to META<a name="line.952"></a>
-<span class="sourceLineNo">953</span>        hbck = doFsck(conf, true, true, false, false, false, false, false, false, false,<a name="line.953"></a>
-<span class="sourceLineNo">954</span>            false, false, null);<a name="line.954"></a>
-<span class="sourceLineNo">955</span>        assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.955"></a>
-<span class="sourceLineNo">956</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.956"></a>
-<span class="sourceLineNo">957</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.957"></a>
-<span class="sourceLineNo">958</span>            HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });<a name="line.958"></a>
-<span class="sourceLineNo">959</span><a name="line.959"></a>
-<span class="sourceLineNo">960</span>        // assert that the split hbase:meta entry is still there.<a name="line.960"></a>
-<span class="sourceLineNo">961</span>        Get get = new Get(hri.getRegionName());<a name="line.961"></a>
-<span class="sourceLineNo">962</span>        Result result = meta.get(get);<a name="line.962"></a>
-<span class="sourceLineNo">963</span>        assertNotNull(result);<a name="line.963"></a>
-<span class="sourceLineNo">964</span>        assertNotNull(MetaTableAccessor.getHRegionInfo(result));<a name="line.964"></a>
-<span class="sourceLineNo">965</span><a name="line.965"></a>
-<span class="sourceLineNo">966</span>        assertEquals(ROWKEYS.length, countRows());<a name="line.966"></a>
-<span class="sourceLineNo">967</span><a name="line.967"></a>
-<span class="sourceLineNo">968</span>        // assert that we still have the split regions<a name="line.968"></a>
-<span class="sourceLineNo">969</span>        assertEquals(rl.getStartKeys().length, SPLITS.length + 1 + 1); //SPLITS + 1 is # regions<a name="line.969"></a>
-<span class="sourceLineNo">970</span>        // pre-split.<a name="line.970"></a>
-<span class="sourceLineNo">971</span>        assertNoErrors(doFsck(conf, false)); //should be fixed by now<a name="line.971"></a>
-<span class="sourceLineNo">972</span>      }<a name="line.972"></a>
-<span class="sourceLineNo">973</span>    } finally {<a name="line.973"></a>
-<span class="sourceLineNo">974</span>      meta.close();<a name="line.974"></a>
-<span class="sourceLineNo">975</span>      cleanupTable(table);<a name="line.975"></a>
-<span class="sourceLineNo">976</span>    }<a name="line.976"></a>
-<span class="sourceLineNo">977</span>  }<a name="line.977"></a>
-<span class="sourceLineNo">978</span><a name="line.978"></a>
-<span class="sourceLineNo">979</span>  /**<a name="line.979"></a>
-<span class="sourceLineNo">980</span>   * This creates and fixes a bad table with a missing region which is the 1st region -- hole in<a name="line.980"></a>
-<span class="sourceLineNo">981</span>   * meta and data missing in the fs.<a name="line.981"></a>
-<span class="sourceLineNo">982</span>   */<a name="line.982"></a>
-<span class="sourceLineNo">983</span>  @Test(timeout=120000)<a name="line.983"></a>
-<span class="sourceLineNo">984</span>  public void testMissingFirstRegion() throws Exception {<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    TableName table = TableName.valueOf("testMissingFirstRegion");<a name="line.985"></a>
-<span class="sourceLineNo">986</span>    try {<a name="line.986"></a>
-<span class="sourceLineNo">987</span>      setupTable(table);<a name="line.987"></a>
-<span class="sourceLineNo">988</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.988"></a>
+<span class="sourceLineNo">946</span>        PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(<a name="line.946"></a>
+<span class="sourceLineNo">947</span>            meta.get(new Get(regionName)));<a name="line.947"></a>
+<span class="sourceLineNo">948</span><a name="line.948"></a>
+<span class="sourceLineNo">949</span>        // Delete daughter regions from meta, but not hdfs, unassign it.<a name="line.949"></a>
+<span class="sourceLineNo">950</span><a name="line.950"></a>
+<span class="sourceLineNo">951</span>        ServerName firstSN =<a name="line.951"></a>
+<span class="sourceLineNo">952</span>            rl.getRegionLocation(daughters.getFirst().getStartKey()).getServerName();<a name="line.952"></a>
+<span class="sourceLineNo">953</span>        ServerName secondSN =<a name="line.953"></a>
+<span class="sourceLineNo">954</span>            rl.getRegionLocation(daughters.getSecond().getStartKey()).getServerName();<a name="line.954"></a>
+<span class="sourceLineNo">955</span><a name="line.955"></a>
+<span class="sourceLineNo">956</span>        undeployRegion(connection, firstSN, daughters.getFirst());<a name="line.956"></a>
+<span class="sourceLineNo">957</span>        undeployRegion(connection, secondSN, daughters.getSecond());<a name="line.957"></a>
+<span class="sourceLineNo">958</span><a name="line.958"></a>
+<span class="sourceLineNo">959</span>        List&lt;Delete&gt; deletes = new ArrayList&lt;&gt;();<a name="line.959"></a>
+<span class="sourceLineNo">960</span>        deletes.add(new Delete(daughters.getFirst().getRegionName()));<a name="line.960"></a>
+<span class="sourceLineNo">961</span>        deletes.add(new Delete(daughters.getSecond().getRegionName()));<a name="line.961"></a>
+<span class="sourceLineNo">962</span>        meta.delete(deletes);<a name="line.962"></a>
+<span class="sourceLineNo">963</span><a name="line.963"></a>
+<span class="sourceLineNo">964</span>        // Remove daughters from regionStates<a name="line.964"></a>
+<span class="sourceLineNo">965</span>        RegionStates regionStates = TEST_UTIL.getMiniHBaseCluster().getMaster().<a name="line.965"></a>
+<span class="sourceLineNo">966</span>            getAssignmentManager().getRegionStates();<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        regionStates.deleteRegion(daughters.getFirst());<a name="line.967"></a>
+<span class="sourceLineNo">968</span>        regionStates.deleteRegion(daughters.getSecond());<a name="line.968"></a>
+<span class="sourceLineNo">969</span><a name="line.969"></a>
+<span class="sourceLineNo">970</span>        HBaseFsck hbck = doFsck(conf, false);<a name="line.970"></a>
+<span class="sourceLineNo">971</span>        assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.971"></a>
+<span class="sourceLineNo">972</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.972"></a>
+<span class="sourceLineNo">973</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.973"></a>
+<span class="sourceLineNo">974</span>            HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN }); //no LINGERING_SPLIT_PARENT<a name="line.974"></a>
+<span class="sourceLineNo">975</span><a name="line.975"></a>
+<span class="sourceLineNo">976</span>        // now fix it. The fix should not revert the region split, but add daughters to META<a name="line.976"></a>
+<span class="sourceLineNo">977</span>        hbck = doFsck(conf, true, true, false, false, false, false, false, false, false,<a name="line.977"></a>
+<span class="sourceLineNo">978</span>            false, false, null);<a name="line.978"></a>
+<span class="sourceLineNo">979</span>        assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] {<a name="line.979"></a>
+<span class="sourceLineNo">980</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.980"></a>
+<span class="sourceLineNo">981</span>            HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,<a name="line.981"></a>
+<span class="sourceLineNo">982</span>            HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });<a name="line.982"></a>
+<span class="sourceLineNo">983</span><a name="line.983"></a>
+<span class="sourceLineNo">984</span>        // assert that the split hbase:meta entry is still there.<a name="line.984"></a>
+<span class="sourceLineNo">985</span>        Get get = new Get(hri.getRegionName());<a name="line.985"></a>
+<span class="sourceLineNo">986</span>        Result result = meta.get(get);<a name="line.986"></a>
+<span class="sourceLineNo">987</span>        assertNotNull(result);<a name="line.987"></a>
+<span class="sourceLineNo">988</span>        assertNotNull(MetaTableAccessor.getHRegionInfo(result));<a name="line.988"></a>
 <span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>      // Mess it up by leaving a hole in the assignment, meta, and hdfs data<a name="line.990"></a>
-<span class="sourceLineNo">991</span>      admin.disableTable(table);<a name="line.991"></a>
-<span class="sourceLineNo">992</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(""), Bytes.toBytes("A"), true,<a name="line.992"></a>
-<span class="sourceLineNo">993</span>          true, true);<a name="line.993"></a>
-<span class="sourceLineNo">994</span>      admin.enableTable(table);<a name="line.994"></a>
-<span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.996"></a>
-<span class="sourceLineNo">997</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.FIRST_REGION_STARTKEY_NOT_EMPTY });<a name="line.997"></a>
-<span class="sourceLineNo">998</span>      // fix hole<a name="line.998"></a>
-<span class="sourceLineNo">999</span>      doFsck(conf, true);<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>      // check that hole fixed<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>      assertNoErrors(doFsck(conf, false));<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>    } finally {<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>      cleanupTable(table);<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>    }<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>  }<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span><a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>  /**<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>   * This creates and fixes a bad table with a missing region which is the 1st region -- hole in<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span>   * meta and data missing in the fs.<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>   */<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>  @Test(timeout=120000)<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>  public void testRegionDeployedNotInHdfs() throws Exception {<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>    TableName table =<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>        TableName.valueOf("testSingleRegionDeployedNotInHdfs");<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>    try {<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>      setupTable(table);<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>      admin.flush(table);<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span><a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>      // Mess it up by deleting region dir<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>      deleteRegion(conf, tbl.getTableDescriptor(),<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span>          HConstants.EMPTY_START_ROW, Bytes.toBytes("A"), false,<a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>          false, true);<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span><a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>      // fix hole<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>      doFsck(conf, true);<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>      // check that hole fixed<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>      assertNoErrors(doFsck(conf, false));<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>    } finally {<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>      cleanupTable(table);<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>    }<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>  }<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span><a name="line.1034"></a>
-<span class="sourceLineNo">1035</span>  /**<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>   * This creates and fixes a bad table with missing last region -- hole in meta and data missing in<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>   * the fs.<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>   */<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span>  @Test(timeout=120000)<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>  public void testMissingLastRegion() throws Exception {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>    TableName table =<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>        TableName.valueOf("testMissingLastRegion");<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>    try {<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span>      setupTable(table);<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>      assertEquals(ROWKEYS.length, countRows());<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span><a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>      // Mess it up by leaving a hole in the assignment, meta, and hdfs data<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>      admin.disableTable(table);<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>      deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("C"), Bytes.toBytes(""), true,<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span>          true, true);<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>      admin.enableTable(table);<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span><a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>      HBaseFsck hbck = doFsck(conf, false);<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span>      assertErrors(hbck, new HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.LAST_REGION_ENDKEY_NOT_EMPTY });<a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>      // fix hole<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>      doFsck(conf, true);<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>      // check that hole fixed<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span>      assertNoErrors(doFsck(conf, false));<a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>    } finally {<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>      cleanupTable(table);<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>    }<a name

<TRUNCATED>

[12/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
index 434ae88..dc0d7a6 100644
--- a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
@@ -96,8 +96,8 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="strong">ExecutorType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="strong">EventType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="strong">ExecutorType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index 1771a52..333dc52 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -161,14 +161,14 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">Filter.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.SatisfiesCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FilterWrapper.FilterRowRetCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">BitComparator.BitwiseOp</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">RegexStringComparator.EngineType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FilterList.Operator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">CompareFilter.CompareOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.SatisfiesCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">BitComparator.BitwiseOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FuzzyRowFilter.Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="strong">FilterWrapper.FilterRowRetCode</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 85ccbe7..cbda46c 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -271,11 +271,11 @@
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">Cacheable.MemoryType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType.BlockCategory</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockPriority</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">HFileBlock.Writer.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">CacheConfig.ExternalBlockCaches</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">HFileBlock.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockPriority</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="strong">BlockType.BlockCategory</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index 2a8744e..818f1f3 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -1078,7 +1078,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <div class="block">Add HBase and its dependencies (only) to the job configuration.
  <p>
  This is intended as a low-level API, facilitating code reuse between this
- class and its mapred counterpart. It also of use to extenral tools that
+ class and its mapred counterpart. It also of use to external tools that
  need to build a MapReduce job that interacts with HBase but want
  fine-grained control over the jars shipped to the cluster.
  </p></div>
@@ -1094,7 +1094,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>buildDependencyClasspath</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.795">buildDependencyClasspath</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.811">buildDependencyClasspath</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">Returns a classpath string built from the content of the "tmpjars" value in <code>conf</code>.
  Also exposed to shell scripts via `bin/hbase mapredcp`.</div>
 </li>
@@ -1105,7 +1105,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>addDependencyJars</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.819">addDependencyJars</a>(org.apache.hadoop.mapreduce.Job&nbsp;job)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.835">addDependencyJars</a>(org.apache.hadoop.mapreduce.Job&nbsp;job)
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Add the HBase dependency jars as well as jars for any of the configured
  job classes to the job configuration, so that JobClient will ship them
@@ -1120,7 +1120,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>addDependencyJars</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.843">addDependencyJars</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.859">addDependencyJars</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;classes)
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Add the jars containing the given classes to the job's configuration
@@ -1136,7 +1136,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>findOrCreateJar</h4>
-<pre>private static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.890">findOrCreateJar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;my_class,
+<pre>private static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.906">findOrCreateJar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;my_class,
                                         org.apache.hadoop.fs.FileSystem&nbsp;fs,
                                         <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;packagedClasses)
                                                   throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -1158,7 +1158,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>updateMap</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.914">updateMap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;jar,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.930">updateMap</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;jar,
              <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;packagedClasses)
                        throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Add entries to <code>packagedClasses</code> corresponding to class files
@@ -1174,7 +1174,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>findContainingJar</h4>
-<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.941">findContainingJar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;my_class,
+<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.957">findContainingJar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;my_class,
                        <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;packagedClasses)
                                  throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Find a jar that contains a class of the same name, if any. It will return
@@ -1193,7 +1193,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getJar</h4>
-<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.981">getJar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;my_class)</pre>
+<pre>private static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.997">getJar</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;my_class)</pre>
 <div class="block">Invoke 'getJar' on a custom JarFinder implementation. Useful for some job
  configuration contexts (HBASE-8140) and also for testing on MRv2.
  check if we have HADOOP-9426.</div>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index fe5a467..e166280 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -267,10 +267,10 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">RowCounter.RowCounterMapper.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">SyncTable.SyncMapper.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">TableSplit.Version</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">CellCounter.CellCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">SyncTable.SyncMapper.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="strong">RowCounter.RowCounterMapper.Counters</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index aae4b55..b7d6c0e 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -318,11 +318,11 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">RegionState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MasterRpcServices.BalanceSwitchMode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.ResubmitDirective</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.TerminationStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MasterRpcServices.BalanceSwitchMode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.ResubmitDirective</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 1a44627..12e13a0 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -351,8 +351,8 @@
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/VersionAnnotation.html" title="annotation in org.apache.hadoop.hbase"><span class="strong">VersionAnnotation</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaMutationAnnotation.html" title="annotation in org.apache.hadoop.hbase"><span class="strong">MetaMutationAnnotation</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/VersionAnnotation.html" title="annotation in org.apache.hadoop.hbase"><span class="strong">VersionAnnotation</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
@@ -360,14 +360,14 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="strong">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="strong">Coprocessor.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeyValue.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeepDeletedCells</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.Modify.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.Modify</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">MetaTableAccessor.QueryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">MetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeyValue.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="strong">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="strong">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeepDeletedCells</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 19ef617..a73d0a7 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -120,8 +120,8 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">StateMachineProcedure.Flow</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">RootProcedureState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">StateMachineProcedure.Flow</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index f948a39..eb1cc43 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -173,10 +173,10 @@
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottleType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">OperationQuota.OperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottleType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">OperationQuota.OperationType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html
index 7314575..e163d00 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/StoreScanner.html
@@ -173,7 +173,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValue
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.html#columns">columns</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>protected int</code></td>
+<td class="colFirst"><code>protected long</code></td>
 <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.html#countPerRow">countPerRow</a></strong></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -677,7 +677,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValue
 <ul class="blockList">
 <li class="blockList">
 <h4>countPerRow</h4>
-<pre>protected&nbsp;int <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html#line.67">countPerRow</a></pre>
+<pre>protected&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StoreScanner.html#line.67">countPerRow</a></pre>
 </li>
 </ul>
 <a name="storeLimit">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index e111f4f..7375de1 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -605,23 +605,23 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.SplitTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitTransaction.SplitTransactionPhase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">FlushType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionMergeTransaction.RegionMergeTransactionPhase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">StoreScanner.StoreScannerCompactionRace</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteResult</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.FlushResult.Result</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">FlushType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanQueryMatcher.MatchCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionOpeningState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionOpeningState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanQueryMatcher.MatchCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">Region.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScanType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DeleteTracker.DeleteCompare.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">DeleteTracker.DeleteCompare</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.RegionMergeTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">RegionMergeTransaction.RegionMergeTransactionPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitTransaction.SplitTransactionPhase.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">SplitTransaction.SplitTransactionPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreScanner.StoreScannerCompactionRace.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">StoreScanner.StoreScannerCompactionRace</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="strong">ScannerContext.LimitScope</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index b606bf6..9b4d86d 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -140,9 +140,9 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessController.OpType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessControlFilter.Strategy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">Permission.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessControlFilter.Strategy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="strong">AccessController.OpType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 4d2432f..9869b17 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -152,9 +152,9 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">AuthMethod</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslUtil.QualityOfProtection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="strong">SaslStatus</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html b/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
index d9e02e4..098ae1e 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html
@@ -108,7 +108,7 @@
 </dl>
 <hr>
 <br>
-<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#line.292">AuthenticationTokenSecretManager.LeaderElector</a>
+<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#line.296">AuthenticationTokenSecretManager.LeaderElector</a>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a>
 implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" title="interface in org.apache.hadoop.hbase">Stoppable</a></pre>
 </li>
@@ -251,7 +251,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>stopped</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.293">stopped</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.297">stopped</a></pre>
 </li>
 </ul>
 <a name="isMaster">
@@ -260,7 +260,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isMaster</h4>
-<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.295">isMaster</a></pre>
+<pre>private&nbsp;boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.299">isMaster</a></pre>
 <div class="block">Flag indicating whether we're in charge of rolling/expiring keys</div>
 </li>
 </ul>
@@ -270,7 +270,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>zkLeader</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKLeaderManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.296">zkLeader</a></pre>
+<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html" title="class in org.apache.hadoop.hbase.zookeeper">ZKLeaderManager</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.300">zkLeader</a></pre>
 </li>
 </ul>
 </li>
@@ -287,7 +287,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AuthenticationTokenSecretManager.LeaderElector</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.298">AuthenticationTokenSecretManager.LeaderElector</a>(<a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.302">AuthenticationTokenSecretManager.LeaderElector</a>(<a href="../../../../../../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.html" title="class in org.apache.hadoop.hbase.zookeeper">ZooKeeperWatcher</a>&nbsp;watcher,
                                               <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;serverName)</pre>
 </li>
 </ul>
@@ -305,7 +305,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isMaster</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.306">isMaster</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.310">isMaster</a>()</pre>
 </li>
 </ul>
 <a name="isStopped()">
@@ -314,7 +314,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>isStopped</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.311">isStopped</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.315">isStopped</a>()</pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html#isStopped()">isStopped</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" title="interface in org.apache.hadoop.hbase">Stoppable</a></code></dd>
@@ -327,7 +327,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockList">
 <li class="blockList">
 <h4>stop</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.316">stop</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;reason)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.320">stop</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;reason)</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html#stop(java.lang.String)">Stoppable</a></code></strong></div>
 <div class="block">Stop this service.</div>
 <dl>
@@ -342,7 +342,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" ti
 <ul class="blockListLast">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.331">run</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.LeaderElector.html#line.335">run</a>()</pre>
 <dl>
 <dt><strong>Specified by:</strong></dt>
 <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true#run()" title="class or interface in java.lang">run</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html b/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
index 8757dd1..58061cd 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html
@@ -277,38 +277,42 @@ extends org.apache.hadoop.security.token.SecretManager&lt;<a href="../../../../.
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#getKey(int)">getKey</a></strong>(int&nbsp;keyId)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>(package private) long</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#getLastKeyUpdate()">getLastKeyUpdate</a></strong>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#getName()">getName</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#isCurrentKeyRolled()">isCurrentKeyRolled</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#isMaster()">isMaster</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#removeExpiredKeys()">removeExpiredKeys</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#removeKey(java.lang.Integer)">removeKey</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&nbsp;keyId)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>byte[]</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#retrievePassword(org.apache.hadoop.hbase.security.token.AuthenticationTokenIdentifier)">retrievePassword</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.html" title="class in org.apache.hadoop.hbase.security.token">AuthenticationTokenIdentifier</a>&nbsp;identifier)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>(package private) void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#rollCurrentKey()">rollCurrentKey</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#start()">start</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#stop()">stop</a></strong>()</code>&nbsp;</td>
 </tr>
@@ -642,13 +646,22 @@ extends org.apache.hadoop.security.token.SecretManager&lt;<a href="../../../../.
 <pre>void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#line.264">rollCurrentKey</a>()</pre>
 </li>
 </ul>
+<a name="getLastKeyUpdate()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLastKeyUpdate</h4>
+<pre>long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#line.288">getLastKeyUpdate</a>()</pre>
+</li>
+</ul>
 <a name="createSecretKey(byte[])">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createSecretKey</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/javax/crypto/SecretKey.html?is-external=true" title="class or interface in javax.crypto">SecretKey</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#line.288">createSecretKey</a>(byte[]&nbsp;raw)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/javax/crypto/SecretKey.html?is-external=true" title="class or interface in javax.crypto">SecretKey</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#line.292">createSecretKey</a>(byte[]&nbsp;raw)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index b720014..cfd1df0 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -159,9 +159,9 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">ThriftServerRunner.ImplType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">ThriftMetrics.ThriftServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="strong">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 </ul>
 </li>
 </ul>


[13/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/29e33858
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/29e33858
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/29e33858

Branch: refs/heads/asf-site
Commit: 29e338589e144b02781eb9128017f7ba6438848d
Parents: 75eda56
Author: jenkins <bu...@apache.org>
Authored: Fri Jan 22 16:20:46 2016 +0000
Committer: Misty Stanley-Jones <ms...@cloudera.com>
Committed: Fri Jan 22 09:00:03 2016 -0800

----------------------------------------------------------------------
 acid-semantics.html                             |    4 +-
 apache_hbase_reference_guide.pdf                |  Bin 14205622 -> 14205622 bytes
 apache_hbase_reference_guide.pdfmarks           |    4 +-
 .../hbase/mapreduce/TableMapReduceUtil.html     |    8 +-
 .../hbase/mapreduce/TableMapReduceUtil.html     |  452 ++--
 book.html                                       |    2 +-
 bulk-loads.html                                 |    4 +-
 checkstyle-aggregate.html                       |   26 +-
 coc.html                                        |    4 +-
 cygwin.html                                     |    4 +-
 dependencies.html                               |    4 +-
 dependency-convergence.html                     |    4 +-
 dependency-info.html                            |    4 +-
 dependency-management.html                      |    4 +-
 devapidocs/index-all.html                       |    2 +
 .../class-use/InterfaceStability.Unstable.html  |   12 +-
 .../hbase/classification/package-tree.html      |    6 +-
 .../hadoop/hbase/client/package-tree.html       |    6 +-
 .../hadoop/hbase/executor/package-tree.html     |    2 +-
 .../hadoop/hbase/filter/package-tree.html       |   10 +-
 .../hadoop/hbase/io/hfile/package-tree.html     |    6 +-
 .../hbase/mapreduce/TableMapReduceUtil.html     |   16 +-
 .../hadoop/hbase/mapreduce/package-tree.html    |    4 +-
 .../hadoop/hbase/master/package-tree.html       |    6 +-
 .../org/apache/hadoop/hbase/package-tree.html   |   12 +-
 .../hadoop/hbase/procedure2/package-tree.html   |    2 +-
 .../hadoop/hbase/quotas/package-tree.html       |    4 +-
 .../hadoop/hbase/regionserver/StoreScanner.html |    4 +-
 .../hadoop/hbase/regionserver/package-tree.html |   20 +-
 .../hbase/security/access/package-tree.html     |    4 +-
 .../hadoop/hbase/security/package-tree.html     |    2 +-
 ...icationTokenSecretManager.LeaderElector.html |   18 +-
 .../token/AuthenticationTokenSecretManager.html |   31 +-
 .../hadoop/hbase/thrift/package-tree.html       |    2 +-
 .../tmpl/master/MasterStatusTmpl.ImplData.html  |  270 +-
 .../hbase/tmpl/master/MasterStatusTmpl.html     |  108 +-
 .../hbase/tmpl/master/MasterStatusTmplImpl.html |   54 +-
 .../regionserver/RSStatusTmpl.ImplData.html     |   60 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.html   |   24 +-
 .../tmpl/regionserver/RSStatusTmplImpl.html     |   12 +-
 .../apache/hadoop/hbase/util/package-tree.html  |    8 +-
 .../apache/hadoop/hbase/wal/package-tree.html   |    2 +-
 .../hbase/mapreduce/TableMapReduceUtil.html     |  452 ++--
 ...StoreScanner.StoreScannerCompactionRace.html |    2 +-
 .../hadoop/hbase/regionserver/StoreScanner.html |    2 +-
 ...icationTokenSecretManager.LeaderElector.html |  139 +-
 .../token/AuthenticationTokenSecretManager.html |  139 +-
 .../tmpl/master/MasterStatusTmpl.ImplData.html  |  270 +-
 .../tmpl/master/MasterStatusTmpl.Intf.html      |  270 +-
 .../hbase/tmpl/master/MasterStatusTmpl.html     |  270 +-
 .../hbase/tmpl/master/MasterStatusTmplImpl.html |   72 +-
 .../regionserver/RSStatusTmpl.ImplData.html     |   60 +-
 .../tmpl/regionserver/RSStatusTmpl.Intf.html    |   60 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.html   |   60 +-
 .../tmpl/regionserver/RSStatusTmplImpl.html     |   16 +-
 ...BaseFsck.CheckRegionConsistencyWorkItem.html |    2 +-
 .../HBaseFsck.ErrorReporter.ERROR_CODE.html     |    2 +-
 .../hbase/util/HBaseFsck.ErrorReporter.html     |    2 +-
 .../hbase/util/HBaseFsck.FileLockCallable.html  |    2 +-
 .../hbase/util/HBaseFsck.HBaseFsckTool.html     |    2 +-
 .../hadoop/hbase/util/HBaseFsck.HbckInfo.html   |    2 +-
 .../hadoop/hbase/util/HBaseFsck.HdfsEntry.html  |    2 +-
 .../hadoop/hbase/util/HBaseFsck.MetaEntry.html  |    2 +-
 .../hbase/util/HBaseFsck.OnlineEntry.html       |    2 +-
 .../util/HBaseFsck.PrintingErrorReporter.html   |    2 +-
 .../HBaseFsck.RegionBoundariesInformation.html  |    2 +-
 .../util/HBaseFsck.RegionRepairException.html   |    2 +-
 .../HBaseFsck.TableInfo.HDFSIntegrityFixer.html |    2 +-
 ...aseFsck.TableInfo.IntegrityFixSuggester.html |    2 +-
 .../hadoop/hbase/util/HBaseFsck.TableInfo.html  |    2 +-
 .../hbase/util/HBaseFsck.WorkItemHdfsDir.html   |    2 +-
 .../util/HBaseFsck.WorkItemHdfsRegionInfo.html  |    2 +-
 .../util/HBaseFsck.WorkItemOverlapMerge.html    |    2 +-
 .../hbase/util/HBaseFsck.WorkItemRegion.html    |    2 +-
 .../org/apache/hadoop/hbase/util/HBaseFsck.html |    2 +-
 distribution-management.html                    |    4 +-
 export_control.html                             |    4 +-
 hbase-annotations/checkstyle.html               |    6 +-
 hbase-annotations/dependencies.html             |    6 +-
 hbase-annotations/dependency-convergence.html   |    6 +-
 hbase-annotations/dependency-info.html          |    6 +-
 hbase-annotations/dependency-management.html    |    6 +-
 hbase-annotations/distribution-management.html  |    6 +-
 hbase-annotations/index.html                    |    6 +-
 hbase-annotations/integration.html              |    6 +-
 hbase-annotations/issue-tracking.html           |    6 +-
 hbase-annotations/license.html                  |    6 +-
 hbase-annotations/mail-lists.html               |    6 +-
 hbase-annotations/plugin-management.html        |    6 +-
 hbase-annotations/plugins.html                  |    6 +-
 hbase-annotations/project-info.html             |    6 +-
 hbase-annotations/project-reports.html          |    6 +-
 hbase-annotations/project-summary.html          |    6 +-
 hbase-annotations/source-repository.html        |    6 +-
 hbase-annotations/team-list.html                |    6 +-
 hbase-spark/checkstyle.html                     |    6 +-
 hbase-spark/dependencies.html                   |    6 +-
 hbase-spark/dependency-convergence.html         |    6 +-
 hbase-spark/dependency-info.html                |    6 +-
 hbase-spark/dependency-management.html          |    6 +-
 hbase-spark/distribution-management.html        |    6 +-
 hbase-spark/index.html                          |    6 +-
 hbase-spark/integration.html                    |    6 +-
 hbase-spark/issue-tracking.html                 |    6 +-
 hbase-spark/license.html                        |    6 +-
 hbase-spark/mail-lists.html                     |    6 +-
 hbase-spark/plugin-management.html              |    6 +-
 hbase-spark/plugins.html                        |    6 +-
 hbase-spark/project-info.html                   |    6 +-
 hbase-spark/project-reports.html                |    6 +-
 hbase-spark/project-summary.html                |    6 +-
 hbase-spark/source-repository.html              |    6 +-
 hbase-spark/team-list.html                      |    6 +-
 index.html                                      |    4 +-
 integration.html                                |    4 +-
 issue-tracking.html                             |    4 +-
 license.html                                    |    4 +-
 mail-lists.html                                 |    4 +-
 metrics.html                                    |    4 +-
 modules.html                                    |    4 +-
 old_news.html                                   |    4 +-
 plugin-management.html                          |    4 +-
 plugins.html                                    |    4 +-
 poweredbyhbase.html                             |    4 +-
 project-info.html                               |    4 +-
 project-reports.html                            |    4 +-
 project-summary.html                            |    4 +-
 pseudo-distributed.html                         |    4 +-
 replication.html                                |    4 +-
 resources.html                                  |    4 +-
 source-repository.html                          |    4 +-
 sponsors.html                                   |    4 +-
 supportingprojects.html                         |    4 +-
 team-list.html                                  |    4 +-
 testdevapidocs/index-all.html                   |    4 +
 .../hadoop/hbase/io/hfile/package-tree.html     |    2 +-
 .../org/apache/hadoop/hbase/package-tree.html   |   12 +-
 .../hadoop/hbase/procedure2/package-tree.html   |    2 +-
 .../hadoop/hbase/regionserver/package-tree.html |    2 +-
 ...AuthenticationTokenSecretManagerForTest.html |    2 +-
 .../apache/hadoop/hbase/test/package-tree.html  |    2 +-
 .../hadoop/hbase/util/TestHBaseFsckOneRS.html   |   85 +-
 .../apache/hadoop/hbase/wal/package-tree.html   |    2 +-
 .../hadoop/hbase/util/TestHBaseFsckOneRS.html   | 2452 +++++++++---------
 .../hadoop/hbase/util/TestHBaseFsckOneRS.html   | 2452 +++++++++---------
 .../hbase/mapreduce/TableMapReduceUtil.html     |  452 ++--
 .../hadoop/hbase/regionserver/StoreScanner.html |    2 +-
 .../token/AuthenticationTokenSecretManager.html |  139 +-
 .../hbase/tmpl/common/TaskMonitorTmpl.html      |   60 +-
 .../hbase/tmpl/common/TaskMonitorTmplImpl.html  |   16 +-
 .../hbase/tmpl/master/MasterStatusTmpl.html     |  270 +-
 .../hbase/tmpl/master/MasterStatusTmplImpl.html |   72 +-
 .../hbase/tmpl/regionserver/RSStatusTmpl.html   |   60 +-
 .../tmpl/regionserver/RSStatusTmplImpl.html     |   16 +-
 .../org/apache/hadoop/hbase/util/HBaseFsck.html |    2 +-
 155 files changed, 4817 insertions(+), 4680 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index 25d9bcc..beb5e4c 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Apache HBase (TM) ACID Properties
@@ -600,7 +600,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 137a324..5d08993 100644
Binary files a/apache_hbase_reference_guide.pdf and b/apache_hbase_reference_guide.pdf differ

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/apache_hbase_reference_guide.pdfmarks
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdfmarks b/apache_hbase_reference_guide.pdfmarks
index 2ff6856..5dddb48 100644
--- a/apache_hbase_reference_guide.pdfmarks
+++ b/apache_hbase_reference_guide.pdfmarks
@@ -2,8 +2,8 @@
   /Author (Apache HBase Team)
   /Subject ()
   /Keywords ()
-  /ModDate (D:20160121150036)
-  /CreationDate (D:20160121150036)
+  /ModDate (D:20160122161716)
+  /CreationDate (D:20160122161716)
   /Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1)
   /Producer ()
   /DOCINFO pdfmark

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index f7f83e1..e531f43 100644
--- a/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -971,7 +971,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <div class="block">Add HBase and its dependencies (only) to the job configuration.
  <p>
  This is intended as a low-level API, facilitating code reuse between this
- class and its mapred counterpart. It also of use to extenral tools that
+ class and its mapred counterpart. It also of use to external tools that
  need to build a MapReduce job that interacts with HBase but want
  fine-grained control over the jars shipped to the cluster.
  </p></div>
@@ -987,7 +987,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>buildDependencyClasspath</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.795">buildDependencyClasspath</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.811">buildDependencyClasspath</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">Returns a classpath string built from the content of the "tmpjars" value in <code>conf</code>.
  Also exposed to shell scripts via `bin/hbase mapredcp`.</div>
 </li>
@@ -998,7 +998,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockList">
 <li class="blockList">
 <h4>addDependencyJars</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.819">addDependencyJars</a>(org.apache.hadoop.mapreduce.Job&nbsp;job)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.835">addDependencyJars</a>(org.apache.hadoop.mapreduce.Job&nbsp;job)
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Add the HBase dependency jars as well as jars for any of the configured
  job classes to the job configuration, so that JobClient will ship them
@@ -1013,7 +1013,7 @@ public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/
 <ul class="blockListLast">
 <li class="blockList">
 <h4>addDependencyJars</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.843">addDependencyJars</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.859">addDependencyJars</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                      <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;...&nbsp;classes)
                               throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Add the jars containing the given classes to the job's configuration

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index 271fd72..4bcfbd0 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -771,7 +771,7 @@
 <span class="sourceLineNo">763</span>   * Add HBase and its dependencies (only) to the job configuration.<a name="line.763"></a>
 <span class="sourceLineNo">764</span>   * &lt;p&gt;<a name="line.764"></a>
 <span class="sourceLineNo">765</span>   * This is intended as a low-level API, facilitating code reuse between this<a name="line.765"></a>
-<span class="sourceLineNo">766</span>   * class and its mapred counterpart. It also of use to extenral tools that<a name="line.766"></a>
+<span class="sourceLineNo">766</span>   * class and its mapred counterpart. It also of use to external tools that<a name="line.766"></a>
 <span class="sourceLineNo">767</span>   * need to build a MapReduce job that interacts with HBase but want<a name="line.767"></a>
 <span class="sourceLineNo">768</span>   * fine-grained control over the jars shipped to the cluster.<a name="line.768"></a>
 <span class="sourceLineNo">769</span>   * &lt;/p&gt;<a name="line.769"></a>
@@ -780,224 +780,240 @@
 <span class="sourceLineNo">772</span>   * @see &lt;a href="https://issues.apache.org/jira/browse/PIG-3285"&gt;PIG-3285&lt;/a&gt;<a name="line.772"></a>
 <span class="sourceLineNo">773</span>   */<a name="line.773"></a>
 <span class="sourceLineNo">774</span>  public static void addHBaseDependencyJars(Configuration conf) throws IOException {<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    addDependencyJars(conf,<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      // explicitly pull a class from each module<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      org.apache.hadoop.hbase.HConstants.class,                      // hbase-common<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      org.apache.hadoop.hbase.client.Put.class,                      // hbase-client<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat<a name="line.780"></a>
-<span class="sourceLineNo">781</span>      org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      // pull necessary dependencies<a name="line.782"></a>
-<span class="sourceLineNo">783</span>      org.apache.zookeeper.ZooKeeper.class,<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      io.netty.channel.Channel.class,<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      com.google.protobuf.Message.class,<a name="line.785"></a>
-<span class="sourceLineNo">786</span>      com.google.common.collect.Lists.class,<a name="line.786"></a>
-<span class="sourceLineNo">787</span>      org.apache.htrace.Trace.class,<a name="line.787"></a>
-<span class="sourceLineNo">788</span>      com.codahale.metrics.MetricRegistry.class);<a name="line.788"></a>
-<span class="sourceLineNo">789</span>  }<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span>  /**<a name="line.791"></a>
-<span class="sourceLineNo">792</span>   * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.<a name="line.792"></a>
-<span class="sourceLineNo">793</span>   * Also exposed to shell scripts via `bin/hbase mapredcp`.<a name="line.793"></a>
-<span class="sourceLineNo">794</span>   */<a name="line.794"></a>
-<span class="sourceLineNo">795</span>  public static String buildDependencyClasspath(Configuration conf) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>    if (conf == null) {<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      throw new IllegalArgumentException("Must provide a configuration object.");<a name="line.797"></a>
-<span class="sourceLineNo">798</span>    }<a name="line.798"></a>
-<span class="sourceLineNo">799</span>    Set&lt;String&gt; paths = new HashSet&lt;String&gt;(conf.getStringCollection("tmpjars"));<a name="line.799"></a>
-<span class="sourceLineNo">800</span>    if (paths.size() == 0) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>      throw new IllegalArgumentException("Configuration contains no tmpjars.");<a name="line.801"></a>
-<span class="sourceLineNo">802</span>    }<a name="line.802"></a>
-<span class="sourceLineNo">803</span>    StringBuilder sb = new StringBuilder();<a name="line.803"></a>
-<span class="sourceLineNo">804</span>    for (String s : paths) {<a name="line.804"></a>
-<span class="sourceLineNo">805</span>      // entries can take the form 'file:/path/to/file.jar'.<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      int idx = s.indexOf(":");<a name="line.806"></a>
-<span class="sourceLineNo">807</span>      if (idx != -1) s = s.substring(idx + 1);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>      if (sb.length() &gt; 0) sb.append(File.pathSeparator);<a name="line.808"></a>
-<span class="sourceLineNo">809</span>      sb.append(s);<a name="line.809"></a>
-<span class="sourceLineNo">810</span>    }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>    return sb.toString();<a name="line.811"></a>
-<span class="sourceLineNo">812</span>  }<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span>  /**<a name="line.814"></a>
-<span class="sourceLineNo">815</span>   * Add the HBase dependency jars as well as jars for any of the configured<a name="line.815"></a>
-<span class="sourceLineNo">816</span>   * job classes to the job configuration, so that JobClient will ship them<a name="line.816"></a>
-<span class="sourceLineNo">817</span>   * to the cluster and add them to the DistributedCache.<a name="line.817"></a>
-<span class="sourceLineNo">818</span>   */<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  public static void addDependencyJars(Job job) throws IOException {<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    addHBaseDependencyJars(job.getConfiguration());<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    try {<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      addDependencyJars(job.getConfiguration(),<a name="line.822"></a>
-<span class="sourceLineNo">823</span>          // when making changes here, consider also mapred.TableMapReduceUtil<a name="line.823"></a>
-<span class="sourceLineNo">824</span>          // pull job classes<a name="line.824"></a>
-<span class="sourceLineNo">825</span>          job.getMapOutputKeyClass(),<a name="line.825"></a>
-<span class="sourceLineNo">826</span>          job.getMapOutputValueClass(),<a name="line.826"></a>
-<span class="sourceLineNo">827</span>          job.getInputFormatClass(),<a name="line.827"></a>
-<span class="sourceLineNo">828</span>          job.getOutputKeyClass(),<a name="line.828"></a>
-<span class="sourceLineNo">829</span>          job.getOutputValueClass(),<a name="line.829"></a>
-<span class="sourceLineNo">830</span>          job.getOutputFormatClass(),<a name="line.830"></a>
-<span class="sourceLineNo">831</span>          job.getPartitionerClass(),<a name="line.831"></a>
-<span class="sourceLineNo">832</span>          job.getCombinerClass());<a name="line.832"></a>
-<span class="sourceLineNo">833</span>    } catch (ClassNotFoundException e) {<a name="line.833"></a>
-<span class="sourceLineNo">834</span>      throw new IOException(e);<a name="line.834"></a>
-<span class="sourceLineNo">835</span>    }<a name="line.835"></a>
-<span class="sourceLineNo">836</span>  }<a name="line.836"></a>
-<span class="sourceLineNo">837</span><a name="line.837"></a>
-<span class="sourceLineNo">838</span>  /**<a name="line.838"></a>
-<span class="sourceLineNo">839</span>   * Add the jars containing the given classes to the job's configuration<a name="line.839"></a>
-<span class="sourceLineNo">840</span>   * such that JobClient will ship them to the cluster and add them to<a name="line.840"></a>
-<span class="sourceLineNo">841</span>   * the DistributedCache.<a name="line.841"></a>
-<span class="sourceLineNo">842</span>   */<a name="line.842"></a>
-<span class="sourceLineNo">843</span>  public static void addDependencyJars(Configuration conf,<a name="line.843"></a>
-<span class="sourceLineNo">844</span>      Class&lt;?&gt;... classes) throws IOException {<a name="line.844"></a>
-<span class="sourceLineNo">845</span><a name="line.845"></a>
-<span class="sourceLineNo">846</span>    FileSystem localFs = FileSystem.getLocal(conf);<a name="line.846"></a>
-<span class="sourceLineNo">847</span>    Set&lt;String&gt; jars = new HashSet&lt;String&gt;();<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    // Add jars that are already in the tmpjars variable<a name="line.848"></a>
-<span class="sourceLineNo">849</span>    jars.addAll(conf.getStringCollection("tmpjars"));<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>    // add jars as we find them to a map of contents jar name so that we can avoid<a name="line.851"></a>
-<span class="sourceLineNo">852</span>    // creating new jars for classes that have already been packaged.<a name="line.852"></a>
-<span class="sourceLineNo">853</span>    Map&lt;String, String&gt; packagedClasses = new HashMap&lt;String, String&gt;();<a name="line.853"></a>
-<span class="sourceLineNo">854</span><a name="line.854"></a>
-<span class="sourceLineNo">855</span>    // Add jars containing the specified classes<a name="line.855"></a>
-<span class="sourceLineNo">856</span>    for (Class&lt;?&gt; clazz : classes) {<a name="line.856"></a>
-<span class="sourceLineNo">857</span>      if (clazz == null) continue;<a name="line.857"></a>
-<span class="sourceLineNo">858</span><a name="line.858"></a>
-<span class="sourceLineNo">859</span>      Path path = findOrCreateJar(clazz, localFs, packagedClasses);<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      if (path == null) {<a name="line.860"></a>
-<span class="sourceLineNo">861</span>        LOG.warn("Could not find jar for class " + clazz +<a name="line.861"></a>
-<span class="sourceLineNo">862</span>                 " in order to ship it to the cluster.");<a name="line.862"></a>
-<span class="sourceLineNo">863</span>        continue;<a name="line.863"></a>
-<span class="sourceLineNo">864</span>      }<a name="line.864"></a>
-<span class="sourceLineNo">865</span>      if (!localFs.exists(path)) {<a name="line.865"></a>
-<span class="sourceLineNo">866</span>        LOG.warn("Could not validate jar file " + path + " for class "<a name="line.866"></a>
-<span class="sourceLineNo">867</span>                 + clazz);<a name="line.867"></a>
-<span class="sourceLineNo">868</span>        continue;<a name="line.868"></a>
-<span class="sourceLineNo">869</span>      }<a name="line.869"></a>
-<span class="sourceLineNo">870</span>      jars.add(path.toString());<a name="line.870"></a>
-<span class="sourceLineNo">871</span>    }<a name="line.871"></a>
-<span class="sourceLineNo">872</span>    if (jars.isEmpty()) return;<a name="line.872"></a>
-<span class="sourceLineNo">873</span><a name="line.873"></a>
-<span class="sourceLineNo">874</span>    conf.set("tmpjars", StringUtils.arrayToString(jars.toArray(new String[jars.size()])));<a name="line.874"></a>
-<span class="sourceLineNo">875</span>  }<a name="line.875"></a>
-<span class="sourceLineNo">876</span><a name="line.876"></a>
-<span class="sourceLineNo">877</span>  /**<a name="line.877"></a>
-<span class="sourceLineNo">878</span>   * Finds the Jar for a class or creates it if it doesn't exist. If the class is in<a name="line.878"></a>
-<span class="sourceLineNo">879</span>   * a directory in the classpath, it creates a Jar on the fly with the<a name="line.879"></a>
-<span class="sourceLineNo">880</span>   * contents of the directory and returns the path to that Jar. If a Jar is<a name="line.880"></a>
-<span class="sourceLineNo">881</span>   * created, it is created in the system temporary directory. Otherwise,<a name="line.881"></a>
-<span class="sourceLineNo">882</span>   * returns an existing jar that contains a class of the same name. Maintains<a name="line.882"></a>
-<span class="sourceLineNo">883</span>   * a mapping from jar contents to the tmp jar created.<a name="line.883"></a>
-<span class="sourceLineNo">884</span>   * @param my_class the class to find.<a name="line.884"></a>
-<span class="sourceLineNo">885</span>   * @param fs the FileSystem with which to qualify the returned path.<a name="line.885"></a>
-<span class="sourceLineNo">886</span>   * @param packagedClasses a map of class name to path.<a name="line.886"></a>
-<span class="sourceLineNo">887</span>   * @return a jar file that contains the class.<a name="line.887"></a>
-<span class="sourceLineNo">888</span>   * @throws IOException<a name="line.888"></a>
-<span class="sourceLineNo">889</span>   */<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  private static Path findOrCreateJar(Class&lt;?&gt; my_class, FileSystem fs,<a name="line.890"></a>
-<span class="sourceLineNo">891</span>      Map&lt;String, String&gt; packagedClasses)<a name="line.891"></a>
-<span class="sourceLineNo">892</span>  throws IOException {<a name="line.892"></a>
-<span class="sourceLineNo">893</span>    // attempt to locate an existing jar for the class.<a name="line.893"></a>
-<span class="sourceLineNo">894</span>    String jar = findContainingJar(my_class, packagedClasses);<a name="line.894"></a>
-<span class="sourceLineNo">895</span>    if (null == jar || jar.isEmpty()) {<a name="line.895"></a>
-<span class="sourceLineNo">896</span>      jar = getJar(my_class);<a name="line.896"></a>
-<span class="sourceLineNo">897</span>      updateMap(jar, packagedClasses);<a name="line.897"></a>
-<span class="sourceLineNo">898</span>    }<a name="line.898"></a>
-<span class="sourceLineNo">899</span><a name="line.899"></a>
-<span class="sourceLineNo">900</span>    if (null == jar || jar.isEmpty()) {<a name="line.900"></a>
-<span class="sourceLineNo">901</span>      return null;<a name="line.901"></a>
-<span class="sourceLineNo">902</span>    }<a name="line.902"></a>
-<span class="sourceLineNo">903</span><a name="line.903"></a>
-<span class="sourceLineNo">904</span>    LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));<a name="line.904"></a>
-<span class="sourceLineNo">905</span>    return new Path(jar).makeQualified(fs);<a name="line.905"></a>
-<span class="sourceLineNo">906</span>  }<a name="line.906"></a>
-<span class="sourceLineNo">907</span><a name="line.907"></a>
-<span class="sourceLineNo">908</span>  /**<a name="line.908"></a>
-<span class="sourceLineNo">909</span>   * Add entries to &lt;code&gt;packagedClasses&lt;/code&gt; corresponding to class files<a name="line.909"></a>
-<span class="sourceLineNo">910</span>   * contained in &lt;code&gt;jar&lt;/code&gt;.<a name="line.910"></a>
-<span class="sourceLineNo">911</span>   * @param jar The jar who's content to list.<a name="line.911"></a>
-<span class="sourceLineNo">912</span>   * @param packagedClasses map[class -&gt; jar]<a name="line.912"></a>
-<span class="sourceLineNo">913</span>   */<a name="line.913"></a>
-<span class="sourceLineNo">914</span>  private static void updateMap(String jar, Map&lt;String, String&gt; packagedClasses) throws IOException {<a name="line.914"></a>
-<span class="sourceLineNo">915</span>    if (null == jar || jar.isEmpty()) {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>      return;<a name="line.916"></a>
-<span class="sourceLineNo">917</span>    }<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    ZipFile zip = null;<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    try {<a name="line.919"></a>
-<span class="sourceLineNo">920</span>      zip = new ZipFile(jar);<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      for (Enumeration&lt;? extends ZipEntry&gt; iter = zip.entries(); iter.hasMoreElements();) {<a name="line.921"></a>
-<span class="sourceLineNo">922</span>        ZipEntry entry = iter.nextElement();<a name="line.922"></a>
-<span class="sourceLineNo">923</span>        if (entry.getName().endsWith("class")) {<a name="line.923"></a>
-<span class="sourceLineNo">924</span>          packagedClasses.put(entry.getName(), jar);<a name="line.924"></a>
-<span class="sourceLineNo">925</span>        }<a name="line.925"></a>
-<span class="sourceLineNo">926</span>      }<a name="line.926"></a>
-<span class="sourceLineNo">927</span>    } finally {<a name="line.927"></a>
-<span class="sourceLineNo">928</span>      if (null != zip) zip.close();<a name="line.928"></a>
-<span class="sourceLineNo">929</span>    }<a name="line.929"></a>
-<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
-<span class="sourceLineNo">931</span><a name="line.931"></a>
-<span class="sourceLineNo">932</span>  /**<a name="line.932"></a>
-<span class="sourceLineNo">933</span>   * Find a jar that contains a class of the same name, if any. It will return<a name="line.933"></a>
-<span class="sourceLineNo">934</span>   * a jar file, even if that is not the first thing on the class path that<a name="line.934"></a>
-<span class="sourceLineNo">935</span>   * has a class with the same name. Looks first on the classpath and then in<a name="line.935"></a>
-<span class="sourceLineNo">936</span>   * the &lt;code&gt;packagedClasses&lt;/code&gt; map.<a name="line.936"></a>
-<span class="sourceLineNo">937</span>   * @param my_class the class to find.<a name="line.937"></a>
-<span class="sourceLineNo">938</span>   * @return a jar file that contains the class, or null.<a name="line.938"></a>
-<span class="sourceLineNo">939</span>   * @throws IOException<a name="line.939"></a>
-<span class="sourceLineNo">940</span>   */<a name="line.940"></a>
-<span class="sourceLineNo">941</span>  private static String findContainingJar(Class&lt;?&gt; my_class, Map&lt;String, String&gt; packagedClasses)<a name="line.941"></a>
-<span class="sourceLineNo">942</span>      throws IOException {<a name="line.942"></a>
-<span class="sourceLineNo">943</span>    ClassLoader loader = my_class.getClassLoader();<a name="line.943"></a>
-<span class="sourceLineNo">944</span><a name="line.944"></a>
-<span class="sourceLineNo">945</span>    String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";<a name="line.945"></a>
-<span class="sourceLineNo">946</span><a name="line.946"></a>
-<span class="sourceLineNo">947</span>    if (loader != null) {<a name="line.947"></a>
-<span class="sourceLineNo">948</span>      // first search the classpath<a name="line.948"></a>
-<span class="sourceLineNo">949</span>      for (Enumeration&lt;URL&gt; itr = loader.getResources(class_file); itr.hasMoreElements();) {<a name="line.949"></a>
-<span class="sourceLineNo">950</span>        URL url = itr.nextElement();<a name="line.950"></a>
-<span class="sourceLineNo">951</span>        if ("jar".equals(url.getProtocol())) {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>          String toReturn = url.getPath();<a name="line.952"></a>
-<span class="sourceLineNo">953</span>          if (toReturn.startsWith("file:")) {<a name="line.953"></a>
-<span class="sourceLineNo">954</span>            toReturn = toReturn.substring("file:".length());<a name="line.954"></a>
-<span class="sourceLineNo">955</span>          }<a name="line.955"></a>
-<span class="sourceLineNo">956</span>          // URLDecoder is a misnamed class, since it actually decodes<a name="line.956"></a>
-<span class="sourceLineNo">957</span>          // x-www-form-urlencoded MIME type rather than actual<a name="line.957"></a>
-<span class="sourceLineNo">958</span>          // URL encoding (which the file path has). Therefore it would<a name="line.958"></a>
-<span class="sourceLineNo">959</span>          // decode +s to ' 's which is incorrect (spaces are actually<a name="line.959"></a>
-<span class="sourceLineNo">960</span>          // either unencoded or encoded as "%20"). Replace +s first, so<a name="line.960"></a>
-<span class="sourceLineNo">961</span>          // that they are kept sacred during the decoding process.<a name="line.961"></a>
-<span class="sourceLineNo">962</span>          toReturn = toReturn.replaceAll("\\+", "%2B");<a name="line.962"></a>
-<span class="sourceLineNo">963</span>          toReturn = URLDecoder.decode(toReturn, "UTF-8");<a name="line.963"></a>
-<span class="sourceLineNo">964</span>          return toReturn.replaceAll("!.*$", "");<a name="line.964"></a>
-<span class="sourceLineNo">965</span>        }<a name="line.965"></a>
-<span class="sourceLineNo">966</span>      }<a name="line.966"></a>
-<span class="sourceLineNo">967</span>    }<a name="line.967"></a>
-<span class="sourceLineNo">968</span><a name="line.968"></a>
-<span class="sourceLineNo">969</span>    // now look in any jars we've packaged using JarFinder. Returns null when<a name="line.969"></a>
-<span class="sourceLineNo">970</span>    // no jar is found.<a name="line.970"></a>
-<span class="sourceLineNo">971</span>    return packagedClasses.get(class_file);<a name="line.971"></a>
-<span class="sourceLineNo">972</span>  }<a name="line.972"></a>
-<span class="sourceLineNo">973</span><a name="line.973"></a>
-<span class="sourceLineNo">974</span>  /**<a name="line.974"></a>
-<span class="sourceLineNo">975</span>   * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job<a name="line.975"></a>
-<span class="sourceLineNo">976</span>   * configuration contexts (HBASE-8140) and also for testing on MRv2.<a name="line.976"></a>
-<span class="sourceLineNo">977</span>   * check if we have HADOOP-9426.<a name="line.977"></a>
-<span class="sourceLineNo">978</span>   * @param my_class the class to find.<a name="line.978"></a>
-<span class="sourceLineNo">979</span>   * @return a jar file that contains the class, or null.<a name="line.979"></a>
-<span class="sourceLineNo">980</span>   */<a name="line.980"></a>
-<span class="sourceLineNo">981</span>  private static String getJar(Class&lt;?&gt; my_class) {<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    String ret = null;<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    try {<a name="line.983"></a>
-<span class="sourceLineNo">984</span>      ret = JarFinder.getJar(my_class);<a name="line.984"></a>
-<span class="sourceLineNo">985</span>    } catch (Exception e) {<a name="line.985"></a>
-<span class="sourceLineNo">986</span>      // toss all other exceptions, related to reflection failure<a name="line.986"></a>
-<span class="sourceLineNo">987</span>      throw new RuntimeException("getJar invocation failed.", e);<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    }<a name="line.988"></a>
+<span class="sourceLineNo">775</span><a name="line.775"></a>
+<span class="sourceLineNo">776</span>    // PrefixTreeCodec is part of the hbase-prefix-tree module. If not included in MR jobs jar<a name="line.776"></a>
+<span class="sourceLineNo">777</span>    // dependencies, MR jobs that write encoded hfiles will fail.<a name="line.777"></a>
+<span class="sourceLineNo">778</span>    // We used reflection here so to prevent a circular module dependency.<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    // TODO - if we extract the MR into a module, make it depend on hbase-prefix-tree.<a name="line.779"></a>
+<span class="sourceLineNo">780</span>    Class prefixTreeCodecClass = null;<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    try {<a name="line.781"></a>
+<span class="sourceLineNo">782</span>      prefixTreeCodecClass =<a name="line.782"></a>
+<span class="sourceLineNo">783</span>          Class.forName("org.apache.hadoop.hbase.code.prefixtree.PrefixTreeCodec");<a name="line.783"></a>
+<span class="sourceLineNo">784</span>    } catch (ClassNotFoundException e) {<a name="line.784"></a>
+<span class="sourceLineNo">785</span>      // this will show up in unit tests but should not show in real deployments<a name="line.785"></a>
+<span class="sourceLineNo">786</span>      LOG.warn("The hbase-prefix-tree module jar containing PrefixTreeCodec is not present." +<a name="line.786"></a>
+<span class="sourceLineNo">787</span>          "  Continuing without it.");<a name="line.787"></a>
+<span class="sourceLineNo">788</span>    }<a name="line.788"></a>
+<span class="sourceLineNo">789</span><a name="line.789"></a>
+<span class="sourceLineNo">790</span>    addDependencyJars(conf,<a name="line.790"></a>
+<span class="sourceLineNo">791</span>      // explicitly pull a class from each module<a name="line.791"></a>
+<span class="sourceLineNo">792</span>      org.apache.hadoop.hbase.HConstants.class,                      // hbase-common<a name="line.792"></a>
+<span class="sourceLineNo">793</span>      org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol<a name="line.793"></a>
+<span class="sourceLineNo">794</span>      org.apache.hadoop.hbase.client.Put.class,                      // hbase-client<a name="line.794"></a>
+<span class="sourceLineNo">795</span>      org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat<a name="line.795"></a>
+<span class="sourceLineNo">796</span>      org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server<a name="line.796"></a>
+<span class="sourceLineNo">797</span>      prefixTreeCodecClass, //  hbase-prefix-tree (if null will be skipped)<a name="line.797"></a>
+<span class="sourceLineNo">798</span>      // pull necessary dependencies<a name="line.798"></a>
+<span class="sourceLineNo">799</span>      org.apache.zookeeper.ZooKeeper.class,<a name="line.799"></a>
+<span class="sourceLineNo">800</span>      io.netty.channel.Channel.class,<a name="line.800"></a>
+<span class="sourceLineNo">801</span>      com.google.protobuf.Message.class,<a name="line.801"></a>
+<span class="sourceLineNo">802</span>      com.google.common.collect.Lists.class,<a name="line.802"></a>
+<span class="sourceLineNo">803</span>      org.apache.htrace.Trace.class,<a name="line.803"></a>
+<span class="sourceLineNo">804</span>      com.codahale.metrics.MetricRegistry.class);<a name="line.804"></a>
+<span class="sourceLineNo">805</span>  }<a name="line.805"></a>
+<span class="sourceLineNo">806</span><a name="line.806"></a>
+<span class="sourceLineNo">807</span>  /**<a name="line.807"></a>
+<span class="sourceLineNo">808</span>   * Returns a classpath string built from the content of the "tmpjars" value in {@code conf}.<a name="line.808"></a>
+<span class="sourceLineNo">809</span>   * Also exposed to shell scripts via `bin/hbase mapredcp`.<a name="line.809"></a>
+<span class="sourceLineNo">810</span>   */<a name="line.810"></a>
+<span class="sourceLineNo">811</span>  public static String buildDependencyClasspath(Configuration conf) {<a name="line.811"></a>
+<span class="sourceLineNo">812</span>    if (conf == null) {<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      throw new IllegalArgumentException("Must provide a configuration object.");<a name="line.813"></a>
+<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
+<span class="sourceLineNo">815</span>    Set&lt;String&gt; paths = new HashSet&lt;String&gt;(conf.getStringCollection("tmpjars"));<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    if (paths.size() == 0) {<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      throw new IllegalArgumentException("Configuration contains no tmpjars.");<a name="line.817"></a>
+<span class="sourceLineNo">818</span>    }<a name="line.818"></a>
+<span class="sourceLineNo">819</span>    StringBuilder sb = new StringBuilder();<a name="line.819"></a>
+<span class="sourceLineNo">820</span>    for (String s : paths) {<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      // entries can take the form 'file:/path/to/file.jar'.<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      int idx = s.indexOf(":");<a name="line.822"></a>
+<span class="sourceLineNo">823</span>      if (idx != -1) s = s.substring(idx + 1);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      if (sb.length() &gt; 0) sb.append(File.pathSeparator);<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      sb.append(s);<a name="line.825"></a>
+<span class="sourceLineNo">826</span>    }<a name="line.826"></a>
+<span class="sourceLineNo">827</span>    return sb.toString();<a name="line.827"></a>
+<span class="sourceLineNo">828</span>  }<a name="line.828"></a>
+<span class="sourceLineNo">829</span><a name="line.829"></a>
+<span class="sourceLineNo">830</span>  /**<a name="line.830"></a>
+<span class="sourceLineNo">831</span>   * Add the HBase dependency jars as well as jars for any of the configured<a name="line.831"></a>
+<span class="sourceLineNo">832</span>   * job classes to the job configuration, so that JobClient will ship them<a name="line.832"></a>
+<span class="sourceLineNo">833</span>   * to the cluster and add them to the DistributedCache.<a name="line.833"></a>
+<span class="sourceLineNo">834</span>   */<a name="line.834"></a>
+<span class="sourceLineNo">835</span>  public static void addDependencyJars(Job job) throws IOException {<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    addHBaseDependencyJars(job.getConfiguration());<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    try {<a name="line.837"></a>
+<span class="sourceLineNo">838</span>      addDependencyJars(job.getConfiguration(),<a name="line.838"></a>
+<span class="sourceLineNo">839</span>          // when making changes here, consider also mapred.TableMapReduceUtil<a name="line.839"></a>
+<span class="sourceLineNo">840</span>          // pull job classes<a name="line.840"></a>
+<span class="sourceLineNo">841</span>          job.getMapOutputKeyClass(),<a name="line.841"></a>
+<span class="sourceLineNo">842</span>          job.getMapOutputValueClass(),<a name="line.842"></a>
+<span class="sourceLineNo">843</span>          job.getInputFormatClass(),<a name="line.843"></a>
+<span class="sourceLineNo">844</span>          job.getOutputKeyClass(),<a name="line.844"></a>
+<span class="sourceLineNo">845</span>          job.getOutputValueClass(),<a name="line.845"></a>
+<span class="sourceLineNo">846</span>          job.getOutputFormatClass(),<a name="line.846"></a>
+<span class="sourceLineNo">847</span>          job.getPartitionerClass(),<a name="line.847"></a>
+<span class="sourceLineNo">848</span>          job.getCombinerClass());<a name="line.848"></a>
+<span class="sourceLineNo">849</span>    } catch (ClassNotFoundException e) {<a name="line.849"></a>
+<span class="sourceLineNo">850</span>      throw new IOException(e);<a name="line.850"></a>
+<span class="sourceLineNo">851</span>    }<a name="line.851"></a>
+<span class="sourceLineNo">852</span>  }<a name="line.852"></a>
+<span class="sourceLineNo">853</span><a name="line.853"></a>
+<span class="sourceLineNo">854</span>  /**<a name="line.854"></a>
+<span class="sourceLineNo">855</span>   * Add the jars containing the given classes to the job's configuration<a name="line.855"></a>
+<span class="sourceLineNo">856</span>   * such that JobClient will ship them to the cluster and add them to<a name="line.856"></a>
+<span class="sourceLineNo">857</span>   * the DistributedCache.<a name="line.857"></a>
+<span class="sourceLineNo">858</span>   */<a name="line.858"></a>
+<span class="sourceLineNo">859</span>  public static void addDependencyJars(Configuration conf,<a name="line.859"></a>
+<span class="sourceLineNo">860</span>      Class&lt;?&gt;... classes) throws IOException {<a name="line.860"></a>
+<span class="sourceLineNo">861</span><a name="line.861"></a>
+<span class="sourceLineNo">862</span>    FileSystem localFs = FileSystem.getLocal(conf);<a name="line.862"></a>
+<span class="sourceLineNo">863</span>    Set&lt;String&gt; jars = new HashSet&lt;String&gt;();<a name="line.863"></a>
+<span class="sourceLineNo">864</span>    // Add jars that are already in the tmpjars variable<a name="line.864"></a>
+<span class="sourceLineNo">865</span>    jars.addAll(conf.getStringCollection("tmpjars"));<a name="line.865"></a>
+<span class="sourceLineNo">866</span><a name="line.866"></a>
+<span class="sourceLineNo">867</span>    // add jars as we find them to a map of contents jar name so that we can avoid<a name="line.867"></a>
+<span class="sourceLineNo">868</span>    // creating new jars for classes that have already been packaged.<a name="line.868"></a>
+<span class="sourceLineNo">869</span>    Map&lt;String, String&gt; packagedClasses = new HashMap&lt;String, String&gt;();<a name="line.869"></a>
+<span class="sourceLineNo">870</span><a name="line.870"></a>
+<span class="sourceLineNo">871</span>    // Add jars containing the specified classes<a name="line.871"></a>
+<span class="sourceLineNo">872</span>    for (Class&lt;?&gt; clazz : classes) {<a name="line.872"></a>
+<span class="sourceLineNo">873</span>      if (clazz == null) continue;<a name="line.873"></a>
+<span class="sourceLineNo">874</span><a name="line.874"></a>
+<span class="sourceLineNo">875</span>      Path path = findOrCreateJar(clazz, localFs, packagedClasses);<a name="line.875"></a>
+<span class="sourceLineNo">876</span>      if (path == null) {<a name="line.876"></a>
+<span class="sourceLineNo">877</span>        LOG.warn("Could not find jar for class " + clazz +<a name="line.877"></a>
+<span class="sourceLineNo">878</span>                 " in order to ship it to the cluster.");<a name="line.878"></a>
+<span class="sourceLineNo">879</span>        continue;<a name="line.879"></a>
+<span class="sourceLineNo">880</span>      }<a name="line.880"></a>
+<span class="sourceLineNo">881</span>      if (!localFs.exists(path)) {<a name="line.881"></a>
+<span class="sourceLineNo">882</span>        LOG.warn("Could not validate jar file " + path + " for class "<a name="line.882"></a>
+<span class="sourceLineNo">883</span>                 + clazz);<a name="line.883"></a>
+<span class="sourceLineNo">884</span>        continue;<a name="line.884"></a>
+<span class="sourceLineNo">885</span>      }<a name="line.885"></a>
+<span class="sourceLineNo">886</span>      jars.add(path.toString());<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    }<a name="line.887"></a>
+<span class="sourceLineNo">888</span>    if (jars.isEmpty()) return;<a name="line.888"></a>
+<span class="sourceLineNo">889</span><a name="line.889"></a>
+<span class="sourceLineNo">890</span>    conf.set("tmpjars", StringUtils.arrayToString(jars.toArray(new String[jars.size()])));<a name="line.890"></a>
+<span class="sourceLineNo">891</span>  }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>  /**<a name="line.893"></a>
+<span class="sourceLineNo">894</span>   * Finds the Jar for a class or creates it if it doesn't exist. If the class is in<a name="line.894"></a>
+<span class="sourceLineNo">895</span>   * a directory in the classpath, it creates a Jar on the fly with the<a name="line.895"></a>
+<span class="sourceLineNo">896</span>   * contents of the directory and returns the path to that Jar. If a Jar is<a name="line.896"></a>
+<span class="sourceLineNo">897</span>   * created, it is created in the system temporary directory. Otherwise,<a name="line.897"></a>
+<span class="sourceLineNo">898</span>   * returns an existing jar that contains a class of the same name. Maintains<a name="line.898"></a>
+<span class="sourceLineNo">899</span>   * a mapping from jar contents to the tmp jar created.<a name="line.899"></a>
+<span class="sourceLineNo">900</span>   * @param my_class the class to find.<a name="line.900"></a>
+<span class="sourceLineNo">901</span>   * @param fs the FileSystem with which to qualify the returned path.<a name="line.901"></a>
+<span class="sourceLineNo">902</span>   * @param packagedClasses a map of class name to path.<a name="line.902"></a>
+<span class="sourceLineNo">903</span>   * @return a jar file that contains the class.<a name="line.903"></a>
+<span class="sourceLineNo">904</span>   * @throws IOException<a name="line.904"></a>
+<span class="sourceLineNo">905</span>   */<a name="line.905"></a>
+<span class="sourceLineNo">906</span>  private static Path findOrCreateJar(Class&lt;?&gt; my_class, FileSystem fs,<a name="line.906"></a>
+<span class="sourceLineNo">907</span>      Map&lt;String, String&gt; packagedClasses)<a name="line.907"></a>
+<span class="sourceLineNo">908</span>  throws IOException {<a name="line.908"></a>
+<span class="sourceLineNo">909</span>    // attempt to locate an existing jar for the class.<a name="line.909"></a>
+<span class="sourceLineNo">910</span>    String jar = findContainingJar(my_class, packagedClasses);<a name="line.910"></a>
+<span class="sourceLineNo">911</span>    if (null == jar || jar.isEmpty()) {<a name="line.911"></a>
+<span class="sourceLineNo">912</span>      jar = getJar(my_class);<a name="line.912"></a>
+<span class="sourceLineNo">913</span>      updateMap(jar, packagedClasses);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>    }<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>    if (null == jar || jar.isEmpty()) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span>      return null;<a name="line.917"></a>
+<span class="sourceLineNo">918</span>    }<a name="line.918"></a>
+<span class="sourceLineNo">919</span><a name="line.919"></a>
+<span class="sourceLineNo">920</span>    LOG.debug(String.format("For class %s, using jar %s", my_class.getName(), jar));<a name="line.920"></a>
+<span class="sourceLineNo">921</span>    return new Path(jar).makeQualified(fs);<a name="line.921"></a>
+<span class="sourceLineNo">922</span>  }<a name="line.922"></a>
+<span class="sourceLineNo">923</span><a name="line.923"></a>
+<span class="sourceLineNo">924</span>  /**<a name="line.924"></a>
+<span class="sourceLineNo">925</span>   * Add entries to &lt;code&gt;packagedClasses&lt;/code&gt; corresponding to class files<a name="line.925"></a>
+<span class="sourceLineNo">926</span>   * contained in &lt;code&gt;jar&lt;/code&gt;.<a name="line.926"></a>
+<span class="sourceLineNo">927</span>   * @param jar The jar who's content to list.<a name="line.927"></a>
+<span class="sourceLineNo">928</span>   * @param packagedClasses map[class -&gt; jar]<a name="line.928"></a>
+<span class="sourceLineNo">929</span>   */<a name="line.929"></a>
+<span class="sourceLineNo">930</span>  private static void updateMap(String jar, Map&lt;String, String&gt; packagedClasses) throws IOException {<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    if (null == jar || jar.isEmpty()) {<a name="line.931"></a>
+<span class="sourceLineNo">932</span>      return;<a name="line.932"></a>
+<span class="sourceLineNo">933</span>    }<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    ZipFile zip = null;<a name="line.934"></a>
+<span class="sourceLineNo">935</span>    try {<a name="line.935"></a>
+<span class="sourceLineNo">936</span>      zip = new ZipFile(jar);<a name="line.936"></a>
+<span class="sourceLineNo">937</span>      for (Enumeration&lt;? extends ZipEntry&gt; iter = zip.entries(); iter.hasMoreElements();) {<a name="line.937"></a>
+<span class="sourceLineNo">938</span>        ZipEntry entry = iter.nextElement();<a name="line.938"></a>
+<span class="sourceLineNo">939</span>        if (entry.getName().endsWith("class")) {<a name="line.939"></a>
+<span class="sourceLineNo">940</span>          packagedClasses.put(entry.getName(), jar);<a name="line.940"></a>
+<span class="sourceLineNo">941</span>        }<a name="line.941"></a>
+<span class="sourceLineNo">942</span>      }<a name="line.942"></a>
+<span class="sourceLineNo">943</span>    } finally {<a name="line.943"></a>
+<span class="sourceLineNo">944</span>      if (null != zip) zip.close();<a name="line.944"></a>
+<span class="sourceLineNo">945</span>    }<a name="line.945"></a>
+<span class="sourceLineNo">946</span>  }<a name="line.946"></a>
+<span class="sourceLineNo">947</span><a name="line.947"></a>
+<span class="sourceLineNo">948</span>  /**<a name="line.948"></a>
+<span class="sourceLineNo">949</span>   * Find a jar that contains a class of the same name, if any. It will return<a name="line.949"></a>
+<span class="sourceLineNo">950</span>   * a jar file, even if that is not the first thing on the class path that<a name="line.950"></a>
+<span class="sourceLineNo">951</span>   * has a class with the same name. Looks first on the classpath and then in<a name="line.951"></a>
+<span class="sourceLineNo">952</span>   * the &lt;code&gt;packagedClasses&lt;/code&gt; map.<a name="line.952"></a>
+<span class="sourceLineNo">953</span>   * @param my_class the class to find.<a name="line.953"></a>
+<span class="sourceLineNo">954</span>   * @return a jar file that contains the class, or null.<a name="line.954"></a>
+<span class="sourceLineNo">955</span>   * @throws IOException<a name="line.955"></a>
+<span class="sourceLineNo">956</span>   */<a name="line.956"></a>
+<span class="sourceLineNo">957</span>  private static String findContainingJar(Class&lt;?&gt; my_class, Map&lt;String, String&gt; packagedClasses)<a name="line.957"></a>
+<span class="sourceLineNo">958</span>      throws IOException {<a name="line.958"></a>
+<span class="sourceLineNo">959</span>    ClassLoader loader = my_class.getClassLoader();<a name="line.959"></a>
+<span class="sourceLineNo">960</span><a name="line.960"></a>
+<span class="sourceLineNo">961</span>    String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";<a name="line.961"></a>
+<span class="sourceLineNo">962</span><a name="line.962"></a>
+<span class="sourceLineNo">963</span>    if (loader != null) {<a name="line.963"></a>
+<span class="sourceLineNo">964</span>      // first search the classpath<a name="line.964"></a>
+<span class="sourceLineNo">965</span>      for (Enumeration&lt;URL&gt; itr = loader.getResources(class_file); itr.hasMoreElements();) {<a name="line.965"></a>
+<span class="sourceLineNo">966</span>        URL url = itr.nextElement();<a name="line.966"></a>
+<span class="sourceLineNo">967</span>        if ("jar".equals(url.getProtocol())) {<a name="line.967"></a>
+<span class="sourceLineNo">968</span>          String toReturn = url.getPath();<a name="line.968"></a>
+<span class="sourceLineNo">969</span>          if (toReturn.startsWith("file:")) {<a name="line.969"></a>
+<span class="sourceLineNo">970</span>            toReturn = toReturn.substring("file:".length());<a name="line.970"></a>
+<span class="sourceLineNo">971</span>          }<a name="line.971"></a>
+<span class="sourceLineNo">972</span>          // URLDecoder is a misnamed class, since it actually decodes<a name="line.972"></a>
+<span class="sourceLineNo">973</span>          // x-www-form-urlencoded MIME type rather than actual<a name="line.973"></a>
+<span class="sourceLineNo">974</span>          // URL encoding (which the file path has). Therefore it would<a name="line.974"></a>
+<span class="sourceLineNo">975</span>          // decode +s to ' 's which is incorrect (spaces are actually<a name="line.975"></a>
+<span class="sourceLineNo">976</span>          // either unencoded or encoded as "%20"). Replace +s first, so<a name="line.976"></a>
+<span class="sourceLineNo">977</span>          // that they are kept sacred during the decoding process.<a name="line.977"></a>
+<span class="sourceLineNo">978</span>          toReturn = toReturn.replaceAll("\\+", "%2B");<a name="line.978"></a>
+<span class="sourceLineNo">979</span>          toReturn = URLDecoder.decode(toReturn, "UTF-8");<a name="line.979"></a>
+<span class="sourceLineNo">980</span>          return toReturn.replaceAll("!.*$", "");<a name="line.980"></a>
+<span class="sourceLineNo">981</span>        }<a name="line.981"></a>
+<span class="sourceLineNo">982</span>      }<a name="line.982"></a>
+<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
+<span class="sourceLineNo">984</span><a name="line.984"></a>
+<span class="sourceLineNo">985</span>    // now look in any jars we've packaged using JarFinder. Returns null when<a name="line.985"></a>
+<span class="sourceLineNo">986</span>    // no jar is found.<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    return packagedClasses.get(class_file);<a name="line.987"></a>
+<span class="sourceLineNo">988</span>  }<a name="line.988"></a>
 <span class="sourceLineNo">989</span><a name="line.989"></a>
-<span class="sourceLineNo">990</span>    return ret;<a name="line.990"></a>
-<span class="sourceLineNo">991</span>  }<a name="line.991"></a>
-<span class="sourceLineNo">992</span>}<a name="line.992"></a>
+<span class="sourceLineNo">990</span>  /**<a name="line.990"></a>
+<span class="sourceLineNo">991</span>   * Invoke 'getJar' on a custom JarFinder implementation. Useful for some job<a name="line.991"></a>
+<span class="sourceLineNo">992</span>   * configuration contexts (HBASE-8140) and also for testing on MRv2.<a name="line.992"></a>
+<span class="sourceLineNo">993</span>   * check if we have HADOOP-9426.<a name="line.993"></a>
+<span class="sourceLineNo">994</span>   * @param my_class the class to find.<a name="line.994"></a>
+<span class="sourceLineNo">995</span>   * @return a jar file that contains the class, or null.<a name="line.995"></a>
+<span class="sourceLineNo">996</span>   */<a name="line.996"></a>
+<span class="sourceLineNo">997</span>  private static String getJar(Class&lt;?&gt; my_class) {<a name="line.997"></a>
+<span class="sourceLineNo">998</span>    String ret = null;<a name="line.998"></a>
+<span class="sourceLineNo">999</span>    try {<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>      ret = JarFinder.getJar(my_class);<a name="line.1000"></a>
+<span class="sourceLineNo">1001</span>    } catch (Exception e) {<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span>      // toss all other exceptions, related to reflection failure<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span>      throw new RuntimeException("getJar invocation failed.", e);<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>    }<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span><a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>    return ret;<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>  }<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>}<a name="line.1008"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 2a551e5..c146003 100644
--- a/book.html
+++ b/book.html
@@ -32933,7 +32933,7 @@ The server will return cellblocks compressed using this same compressor as long
 <div id="footer">
 <div id="footer-text">
 Version 2.0.0-SNAPSHOT<br>
-Last updated 2016-01-21 14:34:40 UTC
+Last updated 2016-01-22 15:48:40 UTC
 </div>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 9b45dba..2689acf 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Bulk Loads in Apache HBase (TM)
@@ -305,7 +305,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index d4d5d23..42471e7 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Checkstyle Results</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -6139,12 +6139,12 @@
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
 <ul>
 <li>offset: <tt>&quot;2&quot;</tt></li></ul></td>
-<td>762</td>
+<td>763</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="b">
 <td></td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3441</td>
+<td>3440</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="a">
 <td>misc</td>
@@ -14598,7 +14598,7 @@
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
 <td>Javadoc comment at column 64 has parse error. Missed HTML close tag 'code'. Sometimes it means that close tag missed for one of previous tags.</td>
 <td><a href="./xref/org/apache/hadoop/hbase/client/HBaseAdmin.html#L1767">1767</a></td></tr>
 <tr class="a">
@@ -36002,49 +36002,49 @@
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L807">807</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L823">823</a></td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L808">808</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L824">824</a></td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L857">857</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L873">873</a></td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L872">872</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L888">888</a></td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L888">888</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L904">904</a></td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>sizes</td>
 <td>LineLength</td>
 <td>Line is longer than 100 characters (found 101).</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L914">914</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L930">930</a></td></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>blocks</td>
 <td>NeedBraces</td>
 <td>'if' construct must use '{}'s.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L928">928</a></td></tr>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L944">944</a></td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
 <td>javadoc</td>
 <td>NonEmptyAtclauseDescription</td>
 <td>At-clause should have a non-empty description.</td>
-<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L939">939</a></td></tr></table></div>
+<td><a href="./xref/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#L955">955</a></td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.mapreduce.TableMapper.java">org/apache/hadoop/hbase/mapreduce/TableMapper.java</h3>
 <table border="0" class="table table-striped">
@@ -93936,7 +93936,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index 5127e47..34f510d 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; 
       Code of Conduct Policy
@@ -331,7 +331,7 @@ For flagrant violations requiring a firm response the PMC may opt to skip early
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/cygwin.html
----------------------------------------------------------------------
diff --git a/cygwin.html b/cygwin.html
index 49bbbdc..2015e3a 100644
--- a/cygwin.html
+++ b/cygwin.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Installing Apache HBase (TM) on Windows using Cygwin</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -673,7 +673,7 @@ Now your <b>HBase </b>server is running, <b>start coding</b> and build that next
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index ca566eb..50ed05a 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Dependencies</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -518,7 +518,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index 2151500..697564c 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Reactor Dependency Convergence</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -1593,7 +1593,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 93fcf83..b2d328c 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Dependency Information</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -312,7 +312,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index d7c330c..c2ec39c 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20160121" />
+    <meta name="Date-Revision-yyyymmdd" content="20160122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Dependency Management</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -786,7 +786,7 @@
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2016-01-21</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2016-01-22</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 679cd96..2a1b83e 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -30017,6 +30017,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/regionserver/StoreFile.Reader.html#getLastKey()">getLastKey()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="./org/apache/hadoop/hbase/regionserver/StoreFile.Reader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile.Reader</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html#getLastKeyUpdate()">getLastKeyUpdate()</a></span> - Method in class org.apache.hadoop.hbase.security.token.<a href="./org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.html" title="class in org.apache.hadoop.hbase.security.token">AuthenticationTokenSecretManager</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/hadoop/hbase/client/Admin.html#getLastMajorCompactionTimestamp(org.apache.hadoop.hbase.TableName)">getLastMajorCompactionTimestamp(TableName)</a></span> - Method in interface org.apache.hadoop.hbase.client.<a href="./org/apache/hadoop/hbase/client/Admin.html" title="interface in org.apache.hadoop.hbase.client">Admin</a></dt>
 <dd>
 <div class="block">Get the timestamp of the last major compaction for the passed table

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Unstable.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Unstable.html b/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Unstable.html
index 1a288a4..20f2daa 100644
--- a/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Unstable.html
+++ b/devapidocs/org/apache/hadoop/hbase/classification/class-use/InterfaceStability.Unstable.html
@@ -136,19 +136,19 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/hadoop/hbase/http/lib/package-summary.html">org.apache.hadoop.hbase.http.lib</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/hadoop/hbase/http/package-summary.html">org.apache.hadoop.hbase.http</a></td>
 <td class="colLast">
 <div class="block">
- This package provides user-selectable (via configuration) classes that add
- functionality to the web UI.</div>
+ Copied from hadoop source code.<br>
+ See https://issues.apache.org/jira/browse/HADOOP-10232 to know why.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/hadoop/hbase/http/package-summary.html">org.apache.hadoop.hbase.http</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/hadoop/hbase/http/lib/package-summary.html">org.apache.hadoop.hbase.http.lib</a></td>
 <td class="colLast">
 <div class="block">
- Copied from hadoop source code.<br>
- See https://issues.apache.org/jira/browse/HADOOP-10232 to know why.</div>
+ This package provides user-selectable (via configuration) classes that add
+ functionality to the web UI.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
index 0b4ba86..8da762a 100644
--- a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html
@@ -80,12 +80,12 @@
 </ul>
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Public</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.LimitedPrivate.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.LimitedPrivate</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Stable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Stable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Unstable.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Unstable</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Public.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Public</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Evolving</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.Private</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.LimitedPrivate.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceAudience.LimitedPrivate</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.classification.<a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceStability.Evolving.html" title="annotation in org.apache.hadoop.hbase.classification"><span class="strong">InterfaceStability.Evolving</span></a> (implements java.lang.annotation.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index b7953b7..2f11f69 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -389,12 +389,12 @@
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">TableState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Durability</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Admin.CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Admin.CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Consistency</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">TableState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">Durability</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcess.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">AsyncProcess.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="strong">IsolationLevel</span></a></li>
 </ul>
 </li>
 </ul>


[04/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref-test/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html b/xref-test/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
index b67c98d..5d8e127 100644
--- a/xref-test/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
+++ b/xref-test/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.html
@@ -590,1238 +590,1262 @@
 <a class="jxr_linenumber" name="580" href="#580">580</a>     }
 <a class="jxr_linenumber" name="581" href="#581">581</a>   }
 <a class="jxr_linenumber" name="582" href="#582">582</a> 
-<a class="jxr_linenumber" name="583" href="#583">583</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="584" href="#584">584</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHbckAfterRegionMerge() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="585" href="#585">585</a>     TableName table = TableName.valueOf(<span class="jxr_string">"testMergeRegionFilesInHdfs"</span>);
-<a class="jxr_linenumber" name="586" href="#586">586</a>     Table meta = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="587" href="#587">587</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="588" href="#588">588</a>       <em class="jxr_comment">// disable CatalogJanitor</em>
-<a class="jxr_linenumber" name="589" href="#589">589</a>       TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);
-<a class="jxr_linenumber" name="590" href="#590">590</a>       setupTable(table);
-<a class="jxr_linenumber" name="591" href="#591">591</a>       assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="592" href="#592">592</a> 
-<a class="jxr_linenumber" name="593" href="#593">593</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
-<a class="jxr_linenumber" name="594" href="#594">594</a>         <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="595" href="#595">595</a>         admin.flush(table);
-<a class="jxr_linenumber" name="596" href="#596">596</a>         HRegionInfo region1 = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"A"</span>)).getRegionInfo();
-<a class="jxr_linenumber" name="597" href="#597">597</a>         HRegionInfo region2 = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>)).getRegionInfo();
-<a class="jxr_linenumber" name="598" href="#598">598</a> 
-<a class="jxr_linenumber" name="599" href="#599">599</a>         <strong class="jxr_keyword">int</strong> regionCountBeforeMerge = rl.getAllRegionLocations().size();
-<a class="jxr_linenumber" name="600" href="#600">600</a> 
-<a class="jxr_linenumber" name="601" href="#601">601</a>         assertNotEquals(region1, region2);
-<a class="jxr_linenumber" name="602" href="#602">602</a> 
-<a class="jxr_linenumber" name="603" href="#603">603</a>         <em class="jxr_comment">// do a region merge</em>
-<a class="jxr_linenumber" name="604" href="#604">604</a>         admin.mergeRegions(region1.getEncodedNameAsBytes(), region2.getEncodedNameAsBytes(), false);
-<a class="jxr_linenumber" name="605" href="#605">605</a> 
-<a class="jxr_linenumber" name="606" href="#606">606</a>         <em class="jxr_comment">// wait until region merged</em>
-<a class="jxr_linenumber" name="607" href="#607">607</a>         <strong class="jxr_keyword">long</strong> timeout = System.currentTimeMillis() + 30 * 1000;
-<a class="jxr_linenumber" name="608" href="#608">608</a>         <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
-<a class="jxr_linenumber" name="609" href="#609">609</a>           <strong class="jxr_keyword">if</strong> (rl.getAllRegionLocations().size() &lt; regionCountBeforeMerge) {
-<a class="jxr_linenumber" name="610" href="#610">610</a>             <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="611" href="#611">611</a>           } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (System.currentTimeMillis() &gt; timeout) {
-<a class="jxr_linenumber" name="612" href="#612">612</a>             fail(<span class="jxr_string">"Time out waiting on region "</span> + region1.getEncodedName() + <span class="jxr_string">" and "</span> + region2
-<a class="jxr_linenumber" name="613" href="#613">613</a>                 .getEncodedName() + <span class="jxr_string">" be merged"</span>);
-<a class="jxr_linenumber" name="614" href="#614">614</a>           }
-<a class="jxr_linenumber" name="615" href="#615">615</a>           Thread.sleep(10);
-<a class="jxr_linenumber" name="616" href="#616">616</a>         }
-<a class="jxr_linenumber" name="617" href="#617">617</a> 
-<a class="jxr_linenumber" name="618" href="#618">618</a>         assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="619" href="#619">619</a> 
-<a class="jxr_linenumber" name="620" href="#620">620</a>         HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="621" href="#621">621</a>         assertNoErrors(hbck); <em class="jxr_comment">// no errors</em>
-<a class="jxr_linenumber" name="622" href="#622">622</a>       }
-<a class="jxr_linenumber" name="623" href="#623">623</a> 
-<a class="jxr_linenumber" name="624" href="#624">624</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="625" href="#625">625</a>       TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="626" href="#626">626</a>       cleanupTable(table);
-<a class="jxr_linenumber" name="627" href="#627">627</a>       IOUtils.closeQuietly(meta);
-<a class="jxr_linenumber" name="628" href="#628">628</a>     }
-<a class="jxr_linenumber" name="629" href="#629">629</a>   }
-<a class="jxr_linenumber" name="630" href="#630">630</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="631" href="#631">631</a> <em class="jxr_javadoccomment">   * This creates entries in hbase:meta with no hdfs data.  This should cleanly</em>
-<a class="jxr_linenumber" name="632" href="#632">632</a> <em class="jxr_javadoccomment">   * remove the table.</em>
-<a class="jxr_linenumber" name="633" href="#633">633</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="634" href="#634">634</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="635" href="#635">635</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNoHdfsTable() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="636" href="#636">636</a>     TableName table = TableName.valueOf(<span class="jxr_string">"NoHdfsTable"</span>);
-<a class="jxr_linenumber" name="637" href="#637">637</a>     setupTable(table);
-<a class="jxr_linenumber" name="638" href="#638">638</a>     assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="639" href="#639">639</a> 
-<a class="jxr_linenumber" name="640" href="#640">640</a>     <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="641" href="#641">641</a>     admin.flush(table);
-<a class="jxr_linenumber" name="642" href="#642">642</a> 
-<a class="jxr_linenumber" name="643" href="#643">643</a>     <em class="jxr_comment">// Mess it up by deleting hdfs dirs</em>
-<a class="jxr_linenumber" name="644" href="#644">644</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">""</span>),
-<a class="jxr_linenumber" name="645" href="#645">645</a>         Bytes.toBytes(<span class="jxr_string">"A"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
-<a class="jxr_linenumber" name="646" href="#646">646</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"A"</span>),
-<a class="jxr_linenumber" name="647" href="#647">647</a>         Bytes.toBytes(<span class="jxr_string">"B"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
-<a class="jxr_linenumber" name="648" href="#648">648</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>),
-<a class="jxr_linenumber" name="649" href="#649">649</a>         Bytes.toBytes(<span class="jxr_string">"C"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
-<a class="jxr_linenumber" name="650" href="#650">650</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"C"</span>),
-<a class="jxr_linenumber" name="651" href="#651">651</a>         Bytes.toBytes(<span class="jxr_string">""</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
-<a class="jxr_linenumber" name="652" href="#652">652</a> 
-<a class="jxr_linenumber" name="653" href="#653">653</a>     <em class="jxr_comment">// also remove the table directory in hdfs</em>
-<a class="jxr_linenumber" name="654" href="#654">654</a>     deleteTableDir(table);
-<a class="jxr_linenumber" name="655" href="#655">655</a> 
-<a class="jxr_linenumber" name="656" href="#656">656</a>     HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="657" href="#657">657</a>     assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,
-<a class="jxr_linenumber" name="658" href="#658">658</a>         HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,
-<a class="jxr_linenumber" name="659" href="#659">659</a>         HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.ORPHAN_TABLE_STATE, });
-<a class="jxr_linenumber" name="660" href="#660">660</a>     <em class="jxr_comment">// holes are separate from overlap groups</em>
-<a class="jxr_linenumber" name="661" href="#661">661</a>     assertEquals(0, hbck.getOverlapGroups(table).size());
-<a class="jxr_linenumber" name="662" href="#662">662</a> 
-<a class="jxr_linenumber" name="663" href="#663">663</a>     <em class="jxr_comment">// fix hole</em>
-<a class="jxr_linenumber" name="664" href="#664">664</a>     doFsck(conf, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// detect dangling regions and remove those</em>
-<a class="jxr_linenumber" name="665" href="#665">665</a> 
-<a class="jxr_linenumber" name="666" href="#666">666</a>     <em class="jxr_comment">// check that hole fixed</em>
-<a class="jxr_linenumber" name="667" href="#667">667</a>     assertNoErrors(doFsck(conf,false));
-<a class="jxr_linenumber" name="668" href="#668">668</a>     assertFalse(<span class="jxr_string">"Table "</span> + table + <span class="jxr_string">" should have been deleted"</span>, admin.tableExists(table));
-<a class="jxr_linenumber" name="669" href="#669">669</a>   }
-<a class="jxr_linenumber" name="670" href="#670">670</a> 
-<a class="jxr_linenumber" name="671" href="#671">671</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="672" href="#672">672</a> <em class="jxr_javadoccomment">   * when the hbase.version file missing, It is fix the fault.</em>
-<a class="jxr_linenumber" name="673" href="#673">673</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="674" href="#674">674</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="675" href="#675">675</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNoVersionFile() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="676" href="#676">676</a>     <em class="jxr_comment">// delete the hbase.version file</em>
-<a class="jxr_linenumber" name="677" href="#677">677</a>     Path rootDir = FSUtils.getRootDir(conf);
-<a class="jxr_linenumber" name="678" href="#678">678</a>     FileSystem fs = rootDir.getFileSystem(conf);
-<a class="jxr_linenumber" name="679" href="#679">679</a>     Path versionFile = <strong class="jxr_keyword">new</strong> Path(rootDir, HConstants.VERSION_FILE_NAME);
-<a class="jxr_linenumber" name="680" href="#680">680</a>     fs.delete(versionFile, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="681" href="#681">681</a> 
-<a class="jxr_linenumber" name="682" href="#682">682</a>     <em class="jxr_comment">// test</em>
-<a class="jxr_linenumber" name="683" href="#683">683</a>     HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="684" href="#684">684</a>     assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_VERSION_FILE });
-<a class="jxr_linenumber" name="685" href="#685">685</a>     <em class="jxr_comment">// fix hbase.version missing</em>
-<a class="jxr_linenumber" name="686" href="#686">686</a>     doFsck(conf, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="687" href="#687">687</a> 
-<a class="jxr_linenumber" name="688" href="#688">688</a>     <em class="jxr_comment">// no version file fixed</em>
-<a class="jxr_linenumber" name="689" href="#689">689</a>     assertNoErrors(doFsck(conf, false));
-<a class="jxr_linenumber" name="690" href="#690">690</a>   }
-<a class="jxr_linenumber" name="691" href="#691">691</a> 
-<a class="jxr_linenumber" name="692" href="#692">692</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="693" href="#693">693</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNoTableState() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="694" href="#694">694</a>     <em class="jxr_comment">// delete the hbase.version file</em>
-<a class="jxr_linenumber" name="695" href="#695">695</a>     TableName table =
-<a class="jxr_linenumber" name="696" href="#696">696</a>         TableName.valueOf(<span class="jxr_string">"testNoTableState"</span>);
-<a class="jxr_linenumber" name="697" href="#697">697</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="698" href="#698">698</a>       setupTable(table);
-<a class="jxr_linenumber" name="699" href="#699">699</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="700" href="#700">700</a>       admin.flush(table);
-<a class="jxr_linenumber" name="701" href="#701">701</a> 
-<a class="jxr_linenumber" name="702" href="#702">702</a>       MetaTableAccessor.deleteTableState(TEST_UTIL.getConnection(), table);
-<a class="jxr_linenumber" name="703" href="#703">703</a> 
-<a class="jxr_linenumber" name="704" href="#704">704</a>       <em class="jxr_comment">// test</em>
-<a class="jxr_linenumber" name="705" href="#705">705</a>       HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="706" href="#706">706</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_TABLE_STATE });
-<a class="jxr_linenumber" name="707" href="#707">707</a>       <em class="jxr_comment">// fix table state missing</em>
-<a class="jxr_linenumber" name="708" href="#708">708</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="709" href="#709">709</a> 
-<a class="jxr_linenumber" name="710" href="#710">710</a>       assertNoErrors(doFsck(conf, false));
-<a class="jxr_linenumber" name="711" href="#711">711</a>       assertTrue(TEST_UTIL.getHBaseAdmin().isTableEnabled(table));
-<a class="jxr_linenumber" name="712" href="#712">712</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="713" href="#713">713</a>       cleanupTable(table);
-<a class="jxr_linenumber" name="714" href="#714">714</a>     }
-<a class="jxr_linenumber" name="715" href="#715">715</a>   }
-<a class="jxr_linenumber" name="716" href="#716">716</a> 
-<a class="jxr_linenumber" name="717" href="#717">717</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="718" href="#718">718</a> <em class="jxr_javadoccomment">   * This creates two tables and mess both of them and fix them one by one</em>
-<a class="jxr_linenumber" name="719" href="#719">719</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="720" href="#720">720</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="721" href="#721">721</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFixByTable() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="722" href="#722">722</a>     TableName table1 =
-<a class="jxr_linenumber" name="723" href="#723">723</a>         TableName.valueOf(<span class="jxr_string">"testFixByTable1"</span>);
-<a class="jxr_linenumber" name="724" href="#724">724</a>     TableName table2 =
-<a class="jxr_linenumber" name="725" href="#725">725</a>         TableName.valueOf(<span class="jxr_string">"testFixByTable2"</span>);
-<a class="jxr_linenumber" name="726" href="#726">726</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="727" href="#727">727</a>       setupTable(table1);
-<a class="jxr_linenumber" name="728" href="#728">728</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="729" href="#729">729</a>       admin.flush(table1);
-<a class="jxr_linenumber" name="730" href="#730">730</a>       <em class="jxr_comment">// Mess them up by leaving a hole in the hdfs data</em>
-<a class="jxr_linenumber" name="731" href="#731">731</a>       deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>),
-<a class="jxr_linenumber" name="732" href="#732">732</a>           Bytes.toBytes(<span class="jxr_string">"C"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="583" href="#583">583</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="584" href="#584">584</a> <em class="jxr_javadoccomment">   * test region boundaries and make sure store file had been created.</em>
+<a class="jxr_linenumber" name="585" href="#585">585</a> <em class="jxr_javadoccomment">   * @throws Exception</em>
+<a class="jxr_linenumber" name="586" href="#586">586</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="587" href="#587">587</a>   @Test(timeout = 180000)
+<a class="jxr_linenumber" name="588" href="#588">588</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testRegionBoundariesCheckWithFlushTable() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="589" href="#589">589</a>     HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="590" href="#590">590</a>     assertNoErrors(hbck); <em class="jxr_comment">// no errors</em>
+<a class="jxr_linenumber" name="591" href="#591">591</a>     TableName table = TableName.valueOf(<span class="jxr_string">"testRegionBoundariesCheckWithFlushTable"</span>);
+<a class="jxr_linenumber" name="592" href="#592">592</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="593" href="#593">593</a>       setupTable(table);
+<a class="jxr_linenumber" name="594" href="#594">594</a>       admin.flush(table);
+<a class="jxr_linenumber" name="595" href="#595">595</a>       hbck.connect(); <em class="jxr_comment">// need connection to have access to META</em>
+<a class="jxr_linenumber" name="596" href="#596">596</a>       hbck.checkRegionBoundaries();
+<a class="jxr_linenumber" name="597" href="#597">597</a>       assertNoErrors(hbck); <em class="jxr_comment">// no errors</em>
+<a class="jxr_linenumber" name="598" href="#598">598</a>     } <strong class="jxr_keyword">catch</strong> (IllegalArgumentException e) {
+<a class="jxr_linenumber" name="599" href="#599">599</a>       <strong class="jxr_keyword">if</strong> (e.getMessage().endsWith(<span class="jxr_string">"not a valid DFS filename."</span>)) {
+<a class="jxr_linenumber" name="600" href="#600">600</a>         fail(<span class="jxr_string">"Table directory path is not valid."</span> + e.getMessage());
+<a class="jxr_linenumber" name="601" href="#601">601</a>       }
+<a class="jxr_linenumber" name="602" href="#602">602</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="603" href="#603">603</a>       hbck.close();
+<a class="jxr_linenumber" name="604" href="#604">604</a>     }
+<a class="jxr_linenumber" name="605" href="#605">605</a>   }
+<a class="jxr_linenumber" name="606" href="#606">606</a>   
+<a class="jxr_linenumber" name="607" href="#607">607</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="608" href="#608">608</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testHbckAfterRegionMerge() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="609" href="#609">609</a>     TableName table = TableName.valueOf(<span class="jxr_string">"testMergeRegionFilesInHdfs"</span>);
+<a class="jxr_linenumber" name="610" href="#610">610</a>     Table meta = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="611" href="#611">611</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="612" href="#612">612</a>       <em class="jxr_comment">// disable CatalogJanitor</em>
+<a class="jxr_linenumber" name="613" href="#613">613</a>       TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);
+<a class="jxr_linenumber" name="614" href="#614">614</a>       setupTable(table);
+<a class="jxr_linenumber" name="615" href="#615">615</a>       assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="616" href="#616">616</a> 
+<a class="jxr_linenumber" name="617" href="#617">617</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
+<a class="jxr_linenumber" name="618" href="#618">618</a>         <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="619" href="#619">619</a>         admin.flush(table);
+<a class="jxr_linenumber" name="620" href="#620">620</a>         HRegionInfo region1 = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"A"</span>)).getRegionInfo();
+<a class="jxr_linenumber" name="621" href="#621">621</a>         HRegionInfo region2 = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>)).getRegionInfo();
+<a class="jxr_linenumber" name="622" href="#622">622</a> 
+<a class="jxr_linenumber" name="623" href="#623">623</a>         <strong class="jxr_keyword">int</strong> regionCountBeforeMerge = rl.getAllRegionLocations().size();
+<a class="jxr_linenumber" name="624" href="#624">624</a> 
+<a class="jxr_linenumber" name="625" href="#625">625</a>         assertNotEquals(region1, region2);
+<a class="jxr_linenumber" name="626" href="#626">626</a> 
+<a class="jxr_linenumber" name="627" href="#627">627</a>         <em class="jxr_comment">// do a region merge</em>
+<a class="jxr_linenumber" name="628" href="#628">628</a>         admin.mergeRegions(region1.getEncodedNameAsBytes(), region2.getEncodedNameAsBytes(), false);
+<a class="jxr_linenumber" name="629" href="#629">629</a> 
+<a class="jxr_linenumber" name="630" href="#630">630</a>         <em class="jxr_comment">// wait until region merged</em>
+<a class="jxr_linenumber" name="631" href="#631">631</a>         <strong class="jxr_keyword">long</strong> timeout = System.currentTimeMillis() + 30 * 1000;
+<a class="jxr_linenumber" name="632" href="#632">632</a>         <strong class="jxr_keyword">while</strong> (<strong class="jxr_keyword">true</strong>) {
+<a class="jxr_linenumber" name="633" href="#633">633</a>           <strong class="jxr_keyword">if</strong> (rl.getAllRegionLocations().size() &lt; regionCountBeforeMerge) {
+<a class="jxr_linenumber" name="634" href="#634">634</a>             <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="635" href="#635">635</a>           } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (System.currentTimeMillis() &gt; timeout) {
+<a class="jxr_linenumber" name="636" href="#636">636</a>             fail(<span class="jxr_string">"Time out waiting on region "</span> + region1.getEncodedName() + <span class="jxr_string">" and "</span> + region2
+<a class="jxr_linenumber" name="637" href="#637">637</a>                 .getEncodedName() + <span class="jxr_string">" be merged"</span>);
+<a class="jxr_linenumber" name="638" href="#638">638</a>           }
+<a class="jxr_linenumber" name="639" href="#639">639</a>           Thread.sleep(10);
+<a class="jxr_linenumber" name="640" href="#640">640</a>         }
+<a class="jxr_linenumber" name="641" href="#641">641</a> 
+<a class="jxr_linenumber" name="642" href="#642">642</a>         assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="643" href="#643">643</a> 
+<a class="jxr_linenumber" name="644" href="#644">644</a>         HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="645" href="#645">645</a>         assertNoErrors(hbck); <em class="jxr_comment">// no errors</em>
+<a class="jxr_linenumber" name="646" href="#646">646</a>       }
+<a class="jxr_linenumber" name="647" href="#647">647</a> 
+<a class="jxr_linenumber" name="648" href="#648">648</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="649" href="#649">649</a>       TEST_UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="650" href="#650">650</a>       cleanupTable(table);
+<a class="jxr_linenumber" name="651" href="#651">651</a>       IOUtils.closeQuietly(meta);
+<a class="jxr_linenumber" name="652" href="#652">652</a>     }
+<a class="jxr_linenumber" name="653" href="#653">653</a>   }
+<a class="jxr_linenumber" name="654" href="#654">654</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="655" href="#655">655</a> <em class="jxr_javadoccomment">   * This creates entries in hbase:meta with no hdfs data.  This should cleanly</em>
+<a class="jxr_linenumber" name="656" href="#656">656</a> <em class="jxr_javadoccomment">   * remove the table.</em>
+<a class="jxr_linenumber" name="657" href="#657">657</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="658" href="#658">658</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="659" href="#659">659</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNoHdfsTable() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="660" href="#660">660</a>     TableName table = TableName.valueOf(<span class="jxr_string">"NoHdfsTable"</span>);
+<a class="jxr_linenumber" name="661" href="#661">661</a>     setupTable(table);
+<a class="jxr_linenumber" name="662" href="#662">662</a>     assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="663" href="#663">663</a> 
+<a class="jxr_linenumber" name="664" href="#664">664</a>     <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="665" href="#665">665</a>     admin.flush(table);
+<a class="jxr_linenumber" name="666" href="#666">666</a> 
+<a class="jxr_linenumber" name="667" href="#667">667</a>     <em class="jxr_comment">// Mess it up by deleting hdfs dirs</em>
+<a class="jxr_linenumber" name="668" href="#668">668</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">""</span>),
+<a class="jxr_linenumber" name="669" href="#669">669</a>         Bytes.toBytes(<span class="jxr_string">"A"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="670" href="#670">670</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"A"</span>),
+<a class="jxr_linenumber" name="671" href="#671">671</a>         Bytes.toBytes(<span class="jxr_string">"B"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="672" href="#672">672</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>),
+<a class="jxr_linenumber" name="673" href="#673">673</a>         Bytes.toBytes(<span class="jxr_string">"C"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="674" href="#674">674</a>     deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"C"</span>),
+<a class="jxr_linenumber" name="675" href="#675">675</a>         Bytes.toBytes(<span class="jxr_string">""</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="676" href="#676">676</a> 
+<a class="jxr_linenumber" name="677" href="#677">677</a>     <em class="jxr_comment">// also remove the table directory in hdfs</em>
+<a class="jxr_linenumber" name="678" href="#678">678</a>     deleteTableDir(table);
+<a class="jxr_linenumber" name="679" href="#679">679</a> 
+<a class="jxr_linenumber" name="680" href="#680">680</a>     HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="681" href="#681">681</a>     assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,
+<a class="jxr_linenumber" name="682" href="#682">682</a>         HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS,
+<a class="jxr_linenumber" name="683" href="#683">683</a>         HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.ORPHAN_TABLE_STATE, });
+<a class="jxr_linenumber" name="684" href="#684">684</a>     <em class="jxr_comment">// holes are separate from overlap groups</em>
+<a class="jxr_linenumber" name="685" href="#685">685</a>     assertEquals(0, hbck.getOverlapGroups(table).size());
+<a class="jxr_linenumber" name="686" href="#686">686</a> 
+<a class="jxr_linenumber" name="687" href="#687">687</a>     <em class="jxr_comment">// fix hole</em>
+<a class="jxr_linenumber" name="688" href="#688">688</a>     doFsck(conf, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// detect dangling regions and remove those</em>
+<a class="jxr_linenumber" name="689" href="#689">689</a> 
+<a class="jxr_linenumber" name="690" href="#690">690</a>     <em class="jxr_comment">// check that hole fixed</em>
+<a class="jxr_linenumber" name="691" href="#691">691</a>     assertNoErrors(doFsck(conf,false));
+<a class="jxr_linenumber" name="692" href="#692">692</a>     assertFalse(<span class="jxr_string">"Table "</span> + table + <span class="jxr_string">" should have been deleted"</span>, admin.tableExists(table));
+<a class="jxr_linenumber" name="693" href="#693">693</a>   }
+<a class="jxr_linenumber" name="694" href="#694">694</a> 
+<a class="jxr_linenumber" name="695" href="#695">695</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="696" href="#696">696</a> <em class="jxr_javadoccomment">   * when the hbase.version file missing, It is fix the fault.</em>
+<a class="jxr_linenumber" name="697" href="#697">697</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="698" href="#698">698</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="699" href="#699">699</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNoVersionFile() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="700" href="#700">700</a>     <em class="jxr_comment">// delete the hbase.version file</em>
+<a class="jxr_linenumber" name="701" href="#701">701</a>     Path rootDir = FSUtils.getRootDir(conf);
+<a class="jxr_linenumber" name="702" href="#702">702</a>     FileSystem fs = rootDir.getFileSystem(conf);
+<a class="jxr_linenumber" name="703" href="#703">703</a>     Path versionFile = <strong class="jxr_keyword">new</strong> Path(rootDir, HConstants.VERSION_FILE_NAME);
+<a class="jxr_linenumber" name="704" href="#704">704</a>     fs.delete(versionFile, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="705" href="#705">705</a> 
+<a class="jxr_linenumber" name="706" href="#706">706</a>     <em class="jxr_comment">// test</em>
+<a class="jxr_linenumber" name="707" href="#707">707</a>     HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="708" href="#708">708</a>     assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_VERSION_FILE });
+<a class="jxr_linenumber" name="709" href="#709">709</a>     <em class="jxr_comment">// fix hbase.version missing</em>
+<a class="jxr_linenumber" name="710" href="#710">710</a>     doFsck(conf, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="711" href="#711">711</a> 
+<a class="jxr_linenumber" name="712" href="#712">712</a>     <em class="jxr_comment">// no version file fixed</em>
+<a class="jxr_linenumber" name="713" href="#713">713</a>     assertNoErrors(doFsck(conf, false));
+<a class="jxr_linenumber" name="714" href="#714">714</a>   }
+<a class="jxr_linenumber" name="715" href="#715">715</a> 
+<a class="jxr_linenumber" name="716" href="#716">716</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="717" href="#717">717</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNoTableState() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="718" href="#718">718</a>     <em class="jxr_comment">// delete the hbase.version file</em>
+<a class="jxr_linenumber" name="719" href="#719">719</a>     TableName table =
+<a class="jxr_linenumber" name="720" href="#720">720</a>         TableName.valueOf(<span class="jxr_string">"testNoTableState"</span>);
+<a class="jxr_linenumber" name="721" href="#721">721</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="722" href="#722">722</a>       setupTable(table);
+<a class="jxr_linenumber" name="723" href="#723">723</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="724" href="#724">724</a>       admin.flush(table);
+<a class="jxr_linenumber" name="725" href="#725">725</a> 
+<a class="jxr_linenumber" name="726" href="#726">726</a>       MetaTableAccessor.deleteTableState(TEST_UTIL.getConnection(), table);
+<a class="jxr_linenumber" name="727" href="#727">727</a> 
+<a class="jxr_linenumber" name="728" href="#728">728</a>       <em class="jxr_comment">// test</em>
+<a class="jxr_linenumber" name="729" href="#729">729</a>       HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="730" href="#730">730</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NO_TABLE_STATE });
+<a class="jxr_linenumber" name="731" href="#731">731</a>       <em class="jxr_comment">// fix table state missing</em>
+<a class="jxr_linenumber" name="732" href="#732">732</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>);
 <a class="jxr_linenumber" name="733" href="#733">733</a> 
-<a class="jxr_linenumber" name="734" href="#734">734</a>       setupTable(table2);
-<a class="jxr_linenumber" name="735" href="#735">735</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="736" href="#736">736</a>       admin.flush(table2);
-<a class="jxr_linenumber" name="737" href="#737">737</a>       <em class="jxr_comment">// Mess them up by leaving a hole in the hdfs data</em>
-<a class="jxr_linenumber" name="738" href="#738">738</a>       deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>), Bytes.toBytes(<span class="jxr_string">"C"</span>), false,
-<a class="jxr_linenumber" name="739" href="#739">739</a>           false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="734" href="#734">734</a>       assertNoErrors(doFsck(conf, false));
+<a class="jxr_linenumber" name="735" href="#735">735</a>       assertTrue(TEST_UTIL.getHBaseAdmin().isTableEnabled(table));
+<a class="jxr_linenumber" name="736" href="#736">736</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="737" href="#737">737</a>       cleanupTable(table);
+<a class="jxr_linenumber" name="738" href="#738">738</a>     }
+<a class="jxr_linenumber" name="739" href="#739">739</a>   }
 <a class="jxr_linenumber" name="740" href="#740">740</a> 
-<a class="jxr_linenumber" name="741" href="#741">741</a>       HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="742" href="#742">742</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });
-<a class="jxr_linenumber" name="743" href="#743">743</a> 
-<a class="jxr_linenumber" name="744" href="#744">744</a>       <em class="jxr_comment">// fix hole in table 1</em>
-<a class="jxr_linenumber" name="745" href="#745">745</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>, table1);
-<a class="jxr_linenumber" name="746" href="#746">746</a>       <em class="jxr_comment">// check that hole in table 1 fixed</em>
-<a class="jxr_linenumber" name="747" href="#747">747</a>       assertNoErrors(doFsck(conf, false, table1));
-<a class="jxr_linenumber" name="748" href="#748">748</a>       <em class="jxr_comment">// check that hole in table 2 still there</em>
-<a class="jxr_linenumber" name="749" href="#749">749</a>       assertErrors(doFsck(conf, false, table2), <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });
-<a class="jxr_linenumber" name="750" href="#750">750</a> 
-<a class="jxr_linenumber" name="751" href="#751">751</a>       <em class="jxr_comment">// fix hole in table 2</em>
-<a class="jxr_linenumber" name="752" href="#752">752</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>, table2);
-<a class="jxr_linenumber" name="753" href="#753">753</a>       <em class="jxr_comment">// check that hole in both tables fixed</em>
-<a class="jxr_linenumber" name="754" href="#754">754</a>       assertNoErrors(doFsck(conf, false));
-<a class="jxr_linenumber" name="755" href="#755">755</a>       assertEquals(ROWKEYS.length - 2, countRows());
-<a class="jxr_linenumber" name="756" href="#756">756</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="757" href="#757">757</a>       cleanupTable(table1);
-<a class="jxr_linenumber" name="758" href="#758">758</a>       cleanupTable(table2);
-<a class="jxr_linenumber" name="759" href="#759">759</a>     }
-<a class="jxr_linenumber" name="760" href="#760">760</a>   }
-<a class="jxr_linenumber" name="761" href="#761">761</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="762" href="#762">762</a> <em class="jxr_javadoccomment">   * A split parent in meta, in hdfs, and not deployed</em>
-<a class="jxr_linenumber" name="763" href="#763">763</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="764" href="#764">764</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="765" href="#765">765</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testLingeringSplitParent() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="766" href="#766">766</a>     TableName table =
-<a class="jxr_linenumber" name="767" href="#767">767</a>         TableName.valueOf(<span class="jxr_string">"testLingeringSplitParent"</span>);
-<a class="jxr_linenumber" name="768" href="#768">768</a>     Table meta = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="769" href="#769">769</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="770" href="#770">770</a>       setupTable(table);
-<a class="jxr_linenumber" name="771" href="#771">771</a>       assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="772" href="#772">772</a> 
-<a class="jxr_linenumber" name="773" href="#773">773</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="774" href="#774">774</a>       admin.flush(table);
-<a class="jxr_linenumber" name="775" href="#775">775</a> 
-<a class="jxr_linenumber" name="776" href="#776">776</a>       HRegionLocation location;
-<a class="jxr_linenumber" name="777" href="#777">777</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
-<a class="jxr_linenumber" name="778" href="#778">778</a>         location = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>));
-<a class="jxr_linenumber" name="779" href="#779">779</a>       }
-<a class="jxr_linenumber" name="780" href="#780">780</a> 
-<a class="jxr_linenumber" name="781" href="#781">781</a>       <em class="jxr_comment">// Delete one region from meta, but not hdfs, unassign it.</em>
-<a class="jxr_linenumber" name="782" href="#782">782</a>       deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>),
-<a class="jxr_linenumber" name="783" href="#783">783</a>           Bytes.toBytes(<span class="jxr_string">"C"</span>), <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false);
-<a class="jxr_linenumber" name="784" href="#784">784</a> 
-<a class="jxr_linenumber" name="785" href="#785">785</a>       <em class="jxr_comment">// Create a new meta entry to fake it as a split parent.</em>
-<a class="jxr_linenumber" name="786" href="#786">786</a>       meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);
-<a class="jxr_linenumber" name="787" href="#787">787</a>       HRegionInfo hri = location.getRegionInfo();
-<a class="jxr_linenumber" name="788" href="#788">788</a> 
-<a class="jxr_linenumber" name="789" href="#789">789</a>       HRegionInfo a = <strong class="jxr_keyword">new</strong> HRegionInfo(tbl.getName(),
-<a class="jxr_linenumber" name="790" href="#790">790</a>           Bytes.toBytes(<span class="jxr_string">"B"</span>), Bytes.toBytes(<span class="jxr_string">"BM"</span>));
-<a class="jxr_linenumber" name="791" href="#791">791</a>       HRegionInfo b = <strong class="jxr_keyword">new</strong> HRegionInfo(tbl.getName(),
-<a class="jxr_linenumber" name="792" href="#792">792</a>           Bytes.toBytes(<span class="jxr_string">"BM"</span>), Bytes.toBytes(<span class="jxr_string">"C"</span>));
-<a class="jxr_linenumber" name="793" href="#793">793</a> 
-<a class="jxr_linenumber" name="794" href="#794">794</a>       hri.setOffline(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="795" href="#795">795</a>       hri.setSplit(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="741" href="#741">741</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="742" href="#742">742</a> <em class="jxr_javadoccomment">   * This creates two tables and mess both of them and fix them one by one</em>
+<a class="jxr_linenumber" name="743" href="#743">743</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="744" href="#744">744</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="745" href="#745">745</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFixByTable() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="746" href="#746">746</a>     TableName table1 =
+<a class="jxr_linenumber" name="747" href="#747">747</a>         TableName.valueOf(<span class="jxr_string">"testFixByTable1"</span>);
+<a class="jxr_linenumber" name="748" href="#748">748</a>     TableName table2 =
+<a class="jxr_linenumber" name="749" href="#749">749</a>         TableName.valueOf(<span class="jxr_string">"testFixByTable2"</span>);
+<a class="jxr_linenumber" name="750" href="#750">750</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="751" href="#751">751</a>       setupTable(table1);
+<a class="jxr_linenumber" name="752" href="#752">752</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="753" href="#753">753</a>       admin.flush(table1);
+<a class="jxr_linenumber" name="754" href="#754">754</a>       <em class="jxr_comment">// Mess them up by leaving a hole in the hdfs data</em>
+<a class="jxr_linenumber" name="755" href="#755">755</a>       deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>),
+<a class="jxr_linenumber" name="756" href="#756">756</a>           Bytes.toBytes(<span class="jxr_string">"C"</span>), false, false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="757" href="#757">757</a> 
+<a class="jxr_linenumber" name="758" href="#758">758</a>       setupTable(table2);
+<a class="jxr_linenumber" name="759" href="#759">759</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="760" href="#760">760</a>       admin.flush(table2);
+<a class="jxr_linenumber" name="761" href="#761">761</a>       <em class="jxr_comment">// Mess them up by leaving a hole in the hdfs data</em>
+<a class="jxr_linenumber" name="762" href="#762">762</a>       deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>), Bytes.toBytes(<span class="jxr_string">"C"</span>), false,
+<a class="jxr_linenumber" name="763" href="#763">763</a>           false, <strong class="jxr_keyword">true</strong>); <em class="jxr_comment">// don't rm meta</em>
+<a class="jxr_linenumber" name="764" href="#764">764</a> 
+<a class="jxr_linenumber" name="765" href="#765">765</a>       HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="766" href="#766">766</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS, HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });
+<a class="jxr_linenumber" name="767" href="#767">767</a> 
+<a class="jxr_linenumber" name="768" href="#768">768</a>       <em class="jxr_comment">// fix hole in table 1</em>
+<a class="jxr_linenumber" name="769" href="#769">769</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>, table1);
+<a class="jxr_linenumber" name="770" href="#770">770</a>       <em class="jxr_comment">// check that hole in table 1 fixed</em>
+<a class="jxr_linenumber" name="771" href="#771">771</a>       assertNoErrors(doFsck(conf, false, table1));
+<a class="jxr_linenumber" name="772" href="#772">772</a>       <em class="jxr_comment">// check that hole in table 2 still there</em>
+<a class="jxr_linenumber" name="773" href="#773">773</a>       assertErrors(doFsck(conf, false, table2), <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] { HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_HDFS });
+<a class="jxr_linenumber" name="774" href="#774">774</a> 
+<a class="jxr_linenumber" name="775" href="#775">775</a>       <em class="jxr_comment">// fix hole in table 2</em>
+<a class="jxr_linenumber" name="776" href="#776">776</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>, table2);
+<a class="jxr_linenumber" name="777" href="#777">777</a>       <em class="jxr_comment">// check that hole in both tables fixed</em>
+<a class="jxr_linenumber" name="778" href="#778">778</a>       assertNoErrors(doFsck(conf, false));
+<a class="jxr_linenumber" name="779" href="#779">779</a>       assertEquals(ROWKEYS.length - 2, countRows());
+<a class="jxr_linenumber" name="780" href="#780">780</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="781" href="#781">781</a>       cleanupTable(table1);
+<a class="jxr_linenumber" name="782" href="#782">782</a>       cleanupTable(table2);
+<a class="jxr_linenumber" name="783" href="#783">783</a>     }
+<a class="jxr_linenumber" name="784" href="#784">784</a>   }
+<a class="jxr_linenumber" name="785" href="#785">785</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="786" href="#786">786</a> <em class="jxr_javadoccomment">   * A split parent in meta, in hdfs, and not deployed</em>
+<a class="jxr_linenumber" name="787" href="#787">787</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="788" href="#788">788</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="789" href="#789">789</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testLingeringSplitParent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="790" href="#790">790</a>     TableName table =
+<a class="jxr_linenumber" name="791" href="#791">791</a>         TableName.valueOf(<span class="jxr_string">"testLingeringSplitParent"</span>);
+<a class="jxr_linenumber" name="792" href="#792">792</a>     Table meta = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="793" href="#793">793</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="794" href="#794">794</a>       setupTable(table);
+<a class="jxr_linenumber" name="795" href="#795">795</a>       assertEquals(ROWKEYS.length, countRows());
 <a class="jxr_linenumber" name="796" href="#796">796</a> 
-<a class="jxr_linenumber" name="797" href="#797">797</a>       MetaTableAccessor.addRegionToMeta(meta, hri, a, b);
-<a class="jxr_linenumber" name="798" href="#798">798</a>       meta.close();
-<a class="jxr_linenumber" name="799" href="#799">799</a>       admin.flush(TableName.META_TABLE_NAME);
-<a class="jxr_linenumber" name="800" href="#800">800</a> 
-<a class="jxr_linenumber" name="801" href="#801">801</a>       HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="802" href="#802">802</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
-<a class="jxr_linenumber" name="803" href="#803">803</a>           HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});
+<a class="jxr_linenumber" name="797" href="#797">797</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="798" href="#798">798</a>       admin.flush(table);
+<a class="jxr_linenumber" name="799" href="#799">799</a> 
+<a class="jxr_linenumber" name="800" href="#800">800</a>       HRegionLocation location;
+<a class="jxr_linenumber" name="801" href="#801">801</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
+<a class="jxr_linenumber" name="802" href="#802">802</a>         location = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>));
+<a class="jxr_linenumber" name="803" href="#803">803</a>       }
 <a class="jxr_linenumber" name="804" href="#804">804</a> 
-<a class="jxr_linenumber" name="805" href="#805">805</a>       <em class="jxr_comment">// regular repair cannot fix lingering split parent</em>
-<a class="jxr_linenumber" name="806" href="#806">806</a>       hbck = doFsck(conf, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="807" href="#807">807</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
-<a class="jxr_linenumber" name="808" href="#808">808</a>           HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });
-<a class="jxr_linenumber" name="809" href="#809">809</a>       assertFalse(hbck.shouldRerun());
-<a class="jxr_linenumber" name="810" href="#810">810</a>       hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="811" href="#811">811</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
-<a class="jxr_linenumber" name="812" href="#812">812</a>           HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});
-<a class="jxr_linenumber" name="813" href="#813">813</a> 
-<a class="jxr_linenumber" name="814" href="#814">814</a>       <em class="jxr_comment">// fix lingering split parent</em>
-<a class="jxr_linenumber" name="815" href="#815">815</a>       hbck = <strong class="jxr_keyword">new</strong> HBaseFsck(conf, hbfsckExecutorService);
-<a class="jxr_linenumber" name="816" href="#816">816</a>       hbck.connect();
-<a class="jxr_linenumber" name="817" href="#817">817</a>       HBaseFsck.setDisplayFullReport(); <em class="jxr_comment">// i.e. -details</em>
-<a class="jxr_linenumber" name="818" href="#818">818</a>       hbck.setTimeLag(0);
-<a class="jxr_linenumber" name="819" href="#819">819</a>       hbck.setFixSplitParents(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="820" href="#820">820</a>       hbck.onlineHbck();
-<a class="jxr_linenumber" name="821" href="#821">821</a>       assertTrue(hbck.shouldRerun());
-<a class="jxr_linenumber" name="822" href="#822">822</a>       hbck.close();
-<a class="jxr_linenumber" name="823" href="#823">823</a> 
-<a class="jxr_linenumber" name="824" href="#824">824</a>       Get get = <strong class="jxr_keyword">new</strong> Get(hri.getRegionName());
-<a class="jxr_linenumber" name="825" href="#825">825</a>       Result result = meta.get(get);
-<a class="jxr_linenumber" name="826" href="#826">826</a>       assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,
-<a class="jxr_linenumber" name="827" href="#827">827</a>           HConstants.SPLITA_QUALIFIER).isEmpty());
-<a class="jxr_linenumber" name="828" href="#828">828</a>       assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,
-<a class="jxr_linenumber" name="829" href="#829">829</a>           HConstants.SPLITB_QUALIFIER).isEmpty());
-<a class="jxr_linenumber" name="830" href="#830">830</a>       admin.flush(TableName.META_TABLE_NAME);
-<a class="jxr_linenumber" name="831" href="#831">831</a> 
-<a class="jxr_linenumber" name="832" href="#832">832</a>       <em class="jxr_comment">// fix other issues</em>
-<a class="jxr_linenumber" name="833" href="#833">833</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="834" href="#834">834</a> 
-<a class="jxr_linenumber" name="835" href="#835">835</a>       <em class="jxr_comment">// check that all are fixed</em>
-<a class="jxr_linenumber" name="836" href="#836">836</a>       assertNoErrors(doFsck(conf, false));
-<a class="jxr_linenumber" name="837" href="#837">837</a>       assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="838" href="#838">838</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="839" href="#839">839</a>       cleanupTable(table);
-<a class="jxr_linenumber" name="840" href="#840">840</a>       IOUtils.closeQuietly(meta);
-<a class="jxr_linenumber" name="841" href="#841">841</a>     }
-<a class="jxr_linenumber" name="842" href="#842">842</a>   }
-<a class="jxr_linenumber" name="843" href="#843">843</a> 
-<a class="jxr_linenumber" name="844" href="#844">844</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="845" href="#845">845</a> <em class="jxr_javadoccomment">   * Tests that LINGERING_SPLIT_PARENT is not erroneously reported for</em>
-<a class="jxr_linenumber" name="846" href="#846">846</a> <em class="jxr_javadoccomment">   * valid cases where the daughters are there.</em>
-<a class="jxr_linenumber" name="847" href="#847">847</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="848" href="#848">848</a>   @Test (timeout=180000)
-<a class="jxr_linenumber" name="849" href="#849">849</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testValidLingeringSplitParent() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="850" href="#850">850</a>     TableName table =
-<a class="jxr_linenumber" name="851" href="#851">851</a>         TableName.valueOf(<span class="jxr_string">"testLingeringSplitParent"</span>);
-<a class="jxr_linenumber" name="852" href="#852">852</a>     Table meta = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="853" href="#853">853</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="854" href="#854">854</a>       setupTable(table);
-<a class="jxr_linenumber" name="855" href="#855">855</a>       assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="856" href="#856">856</a> 
-<a class="jxr_linenumber" name="857" href="#857">857</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="858" href="#858">858</a>       admin.flush(table);
-<a class="jxr_linenumber" name="859" href="#859">859</a> 
-<a class="jxr_linenumber" name="860" href="#860">860</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
-<a class="jxr_linenumber" name="861" href="#861">861</a>         HRegionLocation location = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>));
-<a class="jxr_linenumber" name="862" href="#862">862</a> 
-<a class="jxr_linenumber" name="863" href="#863">863</a>         meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);
-<a class="jxr_linenumber" name="864" href="#864">864</a>         HRegionInfo hri = location.getRegionInfo();
-<a class="jxr_linenumber" name="865" href="#865">865</a> 
-<a class="jxr_linenumber" name="866" href="#866">866</a>         <em class="jxr_comment">// do a regular split</em>
-<a class="jxr_linenumber" name="867" href="#867">867</a>         byte[] regionName = location.getRegionInfo().getRegionName();
-<a class="jxr_linenumber" name="868" href="#868">868</a>         admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes(<span class="jxr_string">"BM"</span>));
-<a class="jxr_linenumber" name="869" href="#869">869</a>         TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="870" href="#870">870</a> 
-<a class="jxr_linenumber" name="871" href="#871">871</a>         <em class="jxr_comment">// TODO: fixHdfsHoles does not work against splits, since the parent dir lingers on</em>
-<a class="jxr_linenumber" name="872" href="#872">872</a>         <em class="jxr_comment">// for some time until children references are deleted. HBCK erroneously sees this as</em>
-<a class="jxr_linenumber" name="873" href="#873">873</a>         <em class="jxr_comment">// overlapping regions</em>
-<a class="jxr_linenumber" name="874" href="#874">874</a>         HBaseFsck hbck = doFsck(conf, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false, false, false, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false,
-<a class="jxr_linenumber" name="875" href="#875">875</a>             false, false, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="876" href="#876">876</a>         assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {}); <em class="jxr_comment">//no LINGERING_SPLIT_PARENT reported</em>
-<a class="jxr_linenumber" name="877" href="#877">877</a> 
-<a class="jxr_linenumber" name="878" href="#878">878</a>         <em class="jxr_comment">// assert that the split hbase:meta entry is still there.</em>
-<a class="jxr_linenumber" name="879" href="#879">879</a>         Get get = <strong class="jxr_keyword">new</strong> Get(hri.getRegionName());
-<a class="jxr_linenumber" name="880" href="#880">880</a>         Result result = meta.get(get);
-<a class="jxr_linenumber" name="881" href="#881">881</a>         assertNotNull(result);
-<a class="jxr_linenumber" name="882" href="#882">882</a>         assertNotNull(MetaTableAccessor.getHRegionInfo(result));
+<a class="jxr_linenumber" name="805" href="#805">805</a>       <em class="jxr_comment">// Delete one region from meta, but not hdfs, unassign it.</em>
+<a class="jxr_linenumber" name="806" href="#806">806</a>       deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes(<span class="jxr_string">"B"</span>),
+<a class="jxr_linenumber" name="807" href="#807">807</a>           Bytes.toBytes(<span class="jxr_string">"C"</span>), <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false);
+<a class="jxr_linenumber" name="808" href="#808">808</a> 
+<a class="jxr_linenumber" name="809" href="#809">809</a>       <em class="jxr_comment">// Create a new meta entry to fake it as a split parent.</em>
+<a class="jxr_linenumber" name="810" href="#810">810</a>       meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);
+<a class="jxr_linenumber" name="811" href="#811">811</a>       HRegionInfo hri = location.getRegionInfo();
+<a class="jxr_linenumber" name="812" href="#812">812</a> 
+<a class="jxr_linenumber" name="813" href="#813">813</a>       HRegionInfo a = <strong class="jxr_keyword">new</strong> HRegionInfo(tbl.getName(),
+<a class="jxr_linenumber" name="814" href="#814">814</a>           Bytes.toBytes(<span class="jxr_string">"B"</span>), Bytes.toBytes(<span class="jxr_string">"BM"</span>));
+<a class="jxr_linenumber" name="815" href="#815">815</a>       HRegionInfo b = <strong class="jxr_keyword">new</strong> HRegionInfo(tbl.getName(),
+<a class="jxr_linenumber" name="816" href="#816">816</a>           Bytes.toBytes(<span class="jxr_string">"BM"</span>), Bytes.toBytes(<span class="jxr_string">"C"</span>));
+<a class="jxr_linenumber" name="817" href="#817">817</a> 
+<a class="jxr_linenumber" name="818" href="#818">818</a>       hri.setOffline(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="819" href="#819">819</a>       hri.setSplit(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="820" href="#820">820</a> 
+<a class="jxr_linenumber" name="821" href="#821">821</a>       MetaTableAccessor.addRegionToMeta(meta, hri, a, b);
+<a class="jxr_linenumber" name="822" href="#822">822</a>       meta.close();
+<a class="jxr_linenumber" name="823" href="#823">823</a>       admin.flush(TableName.META_TABLE_NAME);
+<a class="jxr_linenumber" name="824" href="#824">824</a> 
+<a class="jxr_linenumber" name="825" href="#825">825</a>       HBaseFsck hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="826" href="#826">826</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
+<a class="jxr_linenumber" name="827" href="#827">827</a>           HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});
+<a class="jxr_linenumber" name="828" href="#828">828</a> 
+<a class="jxr_linenumber" name="829" href="#829">829</a>       <em class="jxr_comment">// regular repair cannot fix lingering split parent</em>
+<a class="jxr_linenumber" name="830" href="#830">830</a>       hbck = doFsck(conf, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="831" href="#831">831</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
+<a class="jxr_linenumber" name="832" href="#832">832</a>           HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });
+<a class="jxr_linenumber" name="833" href="#833">833</a>       assertFalse(hbck.shouldRerun());
+<a class="jxr_linenumber" name="834" href="#834">834</a>       hbck = doFsck(conf, false);
+<a class="jxr_linenumber" name="835" href="#835">835</a>       assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
+<a class="jxr_linenumber" name="836" href="#836">836</a>           HBaseFsck.ErrorReporter.ERROR_CODE.LINGERING_SPLIT_PARENT, HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN});
+<a class="jxr_linenumber" name="837" href="#837">837</a> 
+<a class="jxr_linenumber" name="838" href="#838">838</a>       <em class="jxr_comment">// fix lingering split parent</em>
+<a class="jxr_linenumber" name="839" href="#839">839</a>       hbck = <strong class="jxr_keyword">new</strong> HBaseFsck(conf, hbfsckExecutorService);
+<a class="jxr_linenumber" name="840" href="#840">840</a>       hbck.connect();
+<a class="jxr_linenumber" name="841" href="#841">841</a>       HBaseFsck.setDisplayFullReport(); <em class="jxr_comment">// i.e. -details</em>
+<a class="jxr_linenumber" name="842" href="#842">842</a>       hbck.setTimeLag(0);
+<a class="jxr_linenumber" name="843" href="#843">843</a>       hbck.setFixSplitParents(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="844" href="#844">844</a>       hbck.onlineHbck();
+<a class="jxr_linenumber" name="845" href="#845">845</a>       assertTrue(hbck.shouldRerun());
+<a class="jxr_linenumber" name="846" href="#846">846</a>       hbck.close();
+<a class="jxr_linenumber" name="847" href="#847">847</a> 
+<a class="jxr_linenumber" name="848" href="#848">848</a>       Get get = <strong class="jxr_keyword">new</strong> Get(hri.getRegionName());
+<a class="jxr_linenumber" name="849" href="#849">849</a>       Result result = meta.get(get);
+<a class="jxr_linenumber" name="850" href="#850">850</a>       assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,
+<a class="jxr_linenumber" name="851" href="#851">851</a>           HConstants.SPLITA_QUALIFIER).isEmpty());
+<a class="jxr_linenumber" name="852" href="#852">852</a>       assertTrue(result.getColumnCells(HConstants.CATALOG_FAMILY,
+<a class="jxr_linenumber" name="853" href="#853">853</a>           HConstants.SPLITB_QUALIFIER).isEmpty());
+<a class="jxr_linenumber" name="854" href="#854">854</a>       admin.flush(TableName.META_TABLE_NAME);
+<a class="jxr_linenumber" name="855" href="#855">855</a> 
+<a class="jxr_linenumber" name="856" href="#856">856</a>       <em class="jxr_comment">// fix other issues</em>
+<a class="jxr_linenumber" name="857" href="#857">857</a>       doFsck(conf, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="858" href="#858">858</a> 
+<a class="jxr_linenumber" name="859" href="#859">859</a>       <em class="jxr_comment">// check that all are fixed</em>
+<a class="jxr_linenumber" name="860" href="#860">860</a>       assertNoErrors(doFsck(conf, false));
+<a class="jxr_linenumber" name="861" href="#861">861</a>       assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="862" href="#862">862</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="863" href="#863">863</a>       cleanupTable(table);
+<a class="jxr_linenumber" name="864" href="#864">864</a>       IOUtils.closeQuietly(meta);
+<a class="jxr_linenumber" name="865" href="#865">865</a>     }
+<a class="jxr_linenumber" name="866" href="#866">866</a>   }
+<a class="jxr_linenumber" name="867" href="#867">867</a> 
+<a class="jxr_linenumber" name="868" href="#868">868</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="869" href="#869">869</a> <em class="jxr_javadoccomment">   * Tests that LINGERING_SPLIT_PARENT is not erroneously reported for</em>
+<a class="jxr_linenumber" name="870" href="#870">870</a> <em class="jxr_javadoccomment">   * valid cases where the daughters are there.</em>
+<a class="jxr_linenumber" name="871" href="#871">871</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="872" href="#872">872</a>   @Test (timeout=180000)
+<a class="jxr_linenumber" name="873" href="#873">873</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testValidLingeringSplitParent() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="874" href="#874">874</a>     TableName table =
+<a class="jxr_linenumber" name="875" href="#875">875</a>         TableName.valueOf(<span class="jxr_string">"testLingeringSplitParent"</span>);
+<a class="jxr_linenumber" name="876" href="#876">876</a>     Table meta = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="877" href="#877">877</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="878" href="#878">878</a>       setupTable(table);
+<a class="jxr_linenumber" name="879" href="#879">879</a>       assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="880" href="#880">880</a> 
+<a class="jxr_linenumber" name="881" href="#881">881</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="882" href="#882">882</a>       admin.flush(table);
 <a class="jxr_linenumber" name="883" href="#883">883</a> 
-<a class="jxr_linenumber" name="884" href="#884">884</a>         assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="885" href="#885">885</a> 
-<a class="jxr_linenumber" name="886" href="#886">886</a>         <em class="jxr_comment">// assert that we still have the split regions</em>
-<a class="jxr_linenumber" name="887" href="#887">887</a>         assertEquals(rl.getStartKeys().length, SPLITS.length + 1 + 1); <em class="jxr_comment">//SPLITS + 1 is # regions</em>
-<a class="jxr_linenumber" name="888" href="#888">888</a>         <em class="jxr_comment">// pre-split.</em>
-<a class="jxr_linenumber" name="889" href="#889">889</a>         assertNoErrors(doFsck(conf, false));
-<a class="jxr_linenumber" name="890" href="#890">890</a>       }
-<a class="jxr_linenumber" name="891" href="#891">891</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="892" href="#892">892</a>       cleanupTable(table);
-<a class="jxr_linenumber" name="893" href="#893">893</a>       IOUtils.closeQuietly(meta);
-<a class="jxr_linenumber" name="894" href="#894">894</a>     }
-<a class="jxr_linenumber" name="895" href="#895">895</a>   }
-<a class="jxr_linenumber" name="896" href="#896">896</a> 
-<a class="jxr_linenumber" name="897" href="#897">897</a>   <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="898" href="#898">898</a> <em class="jxr_javadoccomment">   * Split crashed after write to hbase:meta finished for the parent region, but</em>
-<a class="jxr_linenumber" name="899" href="#899">899</a> <em class="jxr_javadoccomment">   * failed to write daughters (pre HBASE-7721 codebase)</em>
-<a class="jxr_linenumber" name="900" href="#900">900</a> <em class="jxr_javadoccomment">   */</em>
-<a class="jxr_linenumber" name="901" href="#901">901</a>   @Test(timeout=75000)
-<a class="jxr_linenumber" name="902" href="#902">902</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSplitDaughtersNotInMeta() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="903" href="#903">903</a>     TableName table = TableName.valueOf(<span class="jxr_string">"testSplitdaughtersNotInMeta"</span>);
-<a class="jxr_linenumber" name="904" href="#904">904</a>     Table meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);
-<a class="jxr_linenumber" name="905" href="#905">905</a>     <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="906" href="#906">906</a>       setupTable(table);
-<a class="jxr_linenumber" name="907" href="#907">907</a>       assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="908" href="#908">908</a> 
-<a class="jxr_linenumber" name="909" href="#909">909</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
-<a class="jxr_linenumber" name="910" href="#910">910</a>       admin.flush(table);
-<a class="jxr_linenumber" name="911" href="#911">911</a> 
-<a class="jxr_linenumber" name="912" href="#912">912</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
-<a class="jxr_linenumber" name="913" href="#913">913</a>         HRegionLocation location = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>));
-<a class="jxr_linenumber" name="914" href="#914">914</a> 
-<a class="jxr_linenumber" name="915" href="#915">915</a>         HRegionInfo hri = location.getRegionInfo();
-<a class="jxr_linenumber" name="916" href="#916">916</a> 
-<a class="jxr_linenumber" name="917" href="#917">917</a>         <em class="jxr_comment">// do a regular split</em>
-<a class="jxr_linenumber" name="918" href="#918">918</a>         byte[] regionName = location.getRegionInfo().getRegionName();
-<a class="jxr_linenumber" name="919" href="#919">919</a>         admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes(<span class="jxr_string">"BM"</span>));
-<a class="jxr_linenumber" name="920" href="#920">920</a>         TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="921" href="#921">921</a> 
-<a class="jxr_linenumber" name="922" href="#922">922</a>         PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(
-<a class="jxr_linenumber" name="923" href="#923">923</a>             meta.get(<strong class="jxr_keyword">new</strong> Get(regionName)));
-<a class="jxr_linenumber" name="924" href="#924">924</a> 
-<a class="jxr_linenumber" name="925" href="#925">925</a>         <em class="jxr_comment">// Delete daughter regions from meta, but not hdfs, unassign it.</em>
-<a class="jxr_linenumber" name="926" href="#926">926</a> 
-<a class="jxr_linenumber" name="927" href="#927">927</a>         ServerName firstSN =
-<a class="jxr_linenumber" name="928" href="#928">928</a>             rl.getRegionLocation(daughters.getFirst().getStartKey()).getServerName();
-<a class="jxr_linenumber" name="929" href="#929">929</a>         ServerName secondSN =
-<a class="jxr_linenumber" name="930" href="#930">930</a>             rl.getRegionLocation(daughters.getSecond().getStartKey()).getServerName();
-<a class="jxr_linenumber" name="931" href="#931">931</a> 
-<a class="jxr_linenumber" name="932" href="#932">932</a>         undeployRegion(connection, firstSN, daughters.getFirst());
-<a class="jxr_linenumber" name="933" href="#933">933</a>         undeployRegion(connection, secondSN, daughters.getSecond());
-<a class="jxr_linenumber" name="934" href="#934">934</a> 
-<a class="jxr_linenumber" name="935" href="#935">935</a>         List&lt;Delete&gt; deletes = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;();
-<a class="jxr_linenumber" name="936" href="#936">936</a>         deletes.add(<strong class="jxr_keyword">new</strong> Delete(daughters.getFirst().getRegionName()));
-<a class="jxr_linenumber" name="937" href="#937">937</a>         deletes.add(<strong class="jxr_keyword">new</strong> Delete(daughters.getSecond().getRegionName()));
-<a class="jxr_linenumber" name="938" href="#938">938</a>         meta.delete(deletes);
-<a class="jxr_linenumber" name="939" href="#939">939</a> 
-<a class="jxr_linenumber" name="940" href="#940">940</a>         <em class="jxr_comment">// Remove daughters from regionStates</em>
-<a class="jxr_linenumber" name="941" href="#941">941</a>         RegionStates regionStates = TEST_UTIL.getMiniHBaseCluster().getMaster().
-<a class="jxr_linenumber" name="942" href="#942">942</a>             getAssignmentManager().getRegionStates();
-<a class="jxr_linenumber" name="943" href="#943">943</a>         regionStates.deleteRegion(daughters.getFirst());
-<a class="jxr_linenumber" name="944" href="#944">944</a>         regionStates.deleteRegion(daughters.getSecond());
+<a class="jxr_linenumber" name="884" href="#884">884</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
+<a class="jxr_linenumber" name="885" href="#885">885</a>         HRegionLocation location = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>));
+<a class="jxr_linenumber" name="886" href="#886">886</a> 
+<a class="jxr_linenumber" name="887" href="#887">887</a>         meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);
+<a class="jxr_linenumber" name="888" href="#888">888</a>         HRegionInfo hri = location.getRegionInfo();
+<a class="jxr_linenumber" name="889" href="#889">889</a> 
+<a class="jxr_linenumber" name="890" href="#890">890</a>         <em class="jxr_comment">// do a regular split</em>
+<a class="jxr_linenumber" name="891" href="#891">891</a>         byte[] regionName = location.getRegionInfo().getRegionName();
+<a class="jxr_linenumber" name="892" href="#892">892</a>         admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes(<span class="jxr_string">"BM"</span>));
+<a class="jxr_linenumber" name="893" href="#893">893</a>         TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="894" href="#894">894</a> 
+<a class="jxr_linenumber" name="895" href="#895">895</a>         <em class="jxr_comment">// TODO: fixHdfsHoles does not work against splits, since the parent dir lingers on</em>
+<a class="jxr_linenumber" name="896" href="#896">896</a>         <em class="jxr_comment">// for some time until children references are deleted. HBCK erroneously sees this as</em>
+<a class="jxr_linenumber" name="897" href="#897">897</a>         <em class="jxr_comment">// overlapping regions</em>
+<a class="jxr_linenumber" name="898" href="#898">898</a>         HBaseFsck hbck = doFsck(conf, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false, false, false, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false,
+<a class="jxr_linenumber" name="899" href="#899">899</a>             false, false, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="900" href="#900">900</a>         assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {}); <em class="jxr_comment">//no LINGERING_SPLIT_PARENT reported</em>
+<a class="jxr_linenumber" name="901" href="#901">901</a> 
+<a class="jxr_linenumber" name="902" href="#902">902</a>         <em class="jxr_comment">// assert that the split hbase:meta entry is still there.</em>
+<a class="jxr_linenumber" name="903" href="#903">903</a>         Get get = <strong class="jxr_keyword">new</strong> Get(hri.getRegionName());
+<a class="jxr_linenumber" name="904" href="#904">904</a>         Result result = meta.get(get);
+<a class="jxr_linenumber" name="905" href="#905">905</a>         assertNotNull(result);
+<a class="jxr_linenumber" name="906" href="#906">906</a>         assertNotNull(MetaTableAccessor.getHRegionInfo(result));
+<a class="jxr_linenumber" name="907" href="#907">907</a> 
+<a class="jxr_linenumber" name="908" href="#908">908</a>         assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="909" href="#909">909</a> 
+<a class="jxr_linenumber" name="910" href="#910">910</a>         <em class="jxr_comment">// assert that we still have the split regions</em>
+<a class="jxr_linenumber" name="911" href="#911">911</a>         assertEquals(rl.getStartKeys().length, SPLITS.length + 1 + 1); <em class="jxr_comment">//SPLITS + 1 is # regions</em>
+<a class="jxr_linenumber" name="912" href="#912">912</a>         <em class="jxr_comment">// pre-split.</em>
+<a class="jxr_linenumber" name="913" href="#913">913</a>         assertNoErrors(doFsck(conf, false));
+<a class="jxr_linenumber" name="914" href="#914">914</a>       }
+<a class="jxr_linenumber" name="915" href="#915">915</a>     } <strong class="jxr_keyword">finally</strong> {
+<a class="jxr_linenumber" name="916" href="#916">916</a>       cleanupTable(table);
+<a class="jxr_linenumber" name="917" href="#917">917</a>       IOUtils.closeQuietly(meta);
+<a class="jxr_linenumber" name="918" href="#918">918</a>     }
+<a class="jxr_linenumber" name="919" href="#919">919</a>   }
+<a class="jxr_linenumber" name="920" href="#920">920</a> 
+<a class="jxr_linenumber" name="921" href="#921">921</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="922" href="#922">922</a> <em class="jxr_javadoccomment">   * Split crashed after write to hbase:meta finished for the parent region, but</em>
+<a class="jxr_linenumber" name="923" href="#923">923</a> <em class="jxr_javadoccomment">   * failed to write daughters (pre HBASE-7721 codebase)</em>
+<a class="jxr_linenumber" name="924" href="#924">924</a> <em class="jxr_javadoccomment">   */</em>
+<a class="jxr_linenumber" name="925" href="#925">925</a>   @Test(timeout=75000)
+<a class="jxr_linenumber" name="926" href="#926">926</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSplitDaughtersNotInMeta() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="927" href="#927">927</a>     TableName table = TableName.valueOf(<span class="jxr_string">"testSplitdaughtersNotInMeta"</span>);
+<a class="jxr_linenumber" name="928" href="#928">928</a>     Table meta = connection.getTable(TableName.META_TABLE_NAME, tableExecutorService);
+<a class="jxr_linenumber" name="929" href="#929">929</a>     <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="930" href="#930">930</a>       setupTable(table);
+<a class="jxr_linenumber" name="931" href="#931">931</a>       assertEquals(ROWKEYS.length, countRows());
+<a class="jxr_linenumber" name="932" href="#932">932</a> 
+<a class="jxr_linenumber" name="933" href="#933">933</a>       <em class="jxr_comment">// make sure data in regions, if in wal only there is no data loss</em>
+<a class="jxr_linenumber" name="934" href="#934">934</a>       admin.flush(table);
+<a class="jxr_linenumber" name="935" href="#935">935</a> 
+<a class="jxr_linenumber" name="936" href="#936">936</a>       <strong class="jxr_keyword">try</strong>(RegionLocator rl = connection.getRegionLocator(tbl.getName())) {
+<a class="jxr_linenumber" name="937" href="#937">937</a>         HRegionLocation location = rl.getRegionLocation(Bytes.toBytes(<span class="jxr_string">"B"</span>));
+<a class="jxr_linenumber" name="938" href="#938">938</a> 
+<a class="jxr_linenumber" name="939" href="#939">939</a>         HRegionInfo hri = location.getRegionInfo();
+<a class="jxr_linenumber" name="940" href="#940">940</a> 
+<a class="jxr_linenumber" name="941" href="#941">941</a>         <em class="jxr_comment">// do a regular split</em>
+<a class="jxr_linenumber" name="942" href="#942">942</a>         byte[] regionName = location.getRegionInfo().getRegionName();
+<a class="jxr_linenumber" name="943" href="#943">943</a>         admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes(<span class="jxr_string">"BM"</span>));
+<a class="jxr_linenumber" name="944" href="#944">944</a>         TestEndToEndSplitTransaction.blockUntilRegionSplit(conf, 60000, regionName, <strong class="jxr_keyword">true</strong>);
 <a class="jxr_linenumber" name="945" href="#945">945</a> 
-<a class="jxr_linenumber" name="946" href="#946">946</a>         HBaseFsck hbck = doFsck(conf, false);
-<a class="jxr_linenumber" name="947" href="#947">947</a>         assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
-<a class="jxr_linenumber" name="948" href="#948">948</a>             HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
-<a class="jxr_linenumber" name="949" href="#949">949</a>             HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
-<a class="jxr_linenumber" name="950" href="#950">950</a>             HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN }); <em class="jxr_comment">//no LINGERING_SPLIT_PARENT</em>
-<a class="jxr_linenumber" name="951" href="#951">951</a> 
-<a class="jxr_linenumber" name="952" href="#952">952</a>         <em class="jxr_comment">// now fix it. The fix should not revert the region split, but add daughters to META</em>
-<a class="jxr_linenumber" name="953" href="#953">953</a>         hbck = doFsck(conf, <strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">true</strong>, false, false, false, false, false, false, false,
-<a class="jxr_linenumber" name="954" href="#954">954</a>             false, false, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="955" href="#955">955</a>         assertErrors(hbck, <strong class="jxr_keyword">new</strong> HBaseFsck.ErrorReporter.ERROR_CODE[] {
-<a class="jxr_linenumber" name="956" href="#956">956</a>             HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
-<a class="jxr_linenumber" name="957" href="#957">957</a>             HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
-<a class="jxr_linenumber" name="958" href="#958">958</a>             HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });
-<a class="jxr_linenumber" name="959" href="#959">959</a> 
-<a class="jxr_linenumber" name="960" href="#960">960</a>         <em class="jxr_comment">// assert that the split hbase:meta entry is still there.</em>
-<a class="jxr_linenumber" name="961" href="#961">961</a>         Get get = <strong class="jxr_keyword">new</strong> Get(hri.getRegionName());
-<a class="jxr_linenumber" name="962" href="#962">962</a>         Result result = meta.get(get);
-<a class="jxr_linenumber" name="963" href="#963">963</a>         assertNotNull(result);
-<a class="jxr_linenumber" name="964" href="#964">964</a>         assertNotNull(MetaTableAccessor.getHRegionInfo(result));
-<a class="jxr_linenumber" name="965" href="#965">965</a> 
-<a class="jxr_linenumber" name="966" href="#966">966</a>         assertEquals(ROWKEYS.length, countRows());
-<a class="jxr_linenumber" name="967" href="#967">967</a> 
-<a class="jxr_linenumber" name="968" href="#968">968</a>         <em class="jxr_comment">// assert that we still have the split regions</em>
-<a class="jxr_linenumber" name="969" href="#969">969</a>         assertEquals(rl.getStartKeys().length, SPLITS.length + 1 + 1); <em class="jxr_comment">//SPLITS + 1 is # regions</em>
-<a class="jxr_linenumber" name="970" href="#970">970</a>         <em class="jxr_comment">// pre-split.</em>
-<a class="jxr_linenumber" name="971" href="#971">971</a>         assertNoErrors(doFsck(conf, false)); <em class="jxr_comment">//should be fixed by now</em>
-<a class="jxr_linenumber" name="972" href="#972">972</a>       }
-<a class="jxr_linenumber" name="973" href="#973">973</a>     } <strong class="jxr_keyword">finally</strong> {
-<a class="jxr_linenumber" name="974" href="#974">974</a>       meta.close();
-<a class="jxr_linenumber" name="975" href="#975">975</a>       cleanupTable(table);
-<a class="jxr_linenumber" name="976" href="#976">976</a>     }
-<a class="jxr_linenumber" name="977" href="#977">977</a>   }
-<a class="jxr_line

<TRUNCATED>

[02/13] hbase-site git commit: Published site at f9e69b51e1997c6de2ed74f9edbc6947b11c88dc.

Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
index 603c675..b3ca88d 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html
@@ -24,8 +24,8 @@
 <a class="jxr_linenumber" name="14" href="#14">14</a>    signature = <span class="jxr_string">"E1689F04F06BAD5E628913C375AEB2C0"</span>,
 <a class="jxr_linenumber" name="15" href="#15">15</a>    optionalArguments = {
 <a class="jxr_linenumber" name="16" href="#16">16</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="17" href="#17">17</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"taskMonitor"</span>, type = <span class="jxr_string">"TaskMonitor"</span>),
-<a class="jxr_linenumber" name="18" href="#18">18</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>)})
+<a class="jxr_linenumber" name="17" href="#17">17</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="18" href="#18">18</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"taskMonitor"</span>, type = <span class="jxr_string">"TaskMonitor"</span>)})
 <a class="jxr_linenumber" name="19" href="#19">19</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.html">TaskMonitorTmpl</a>
 <a class="jxr_linenumber" name="20" href="#20">20</a>    <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
 <a class="jxr_linenumber" name="21" href="#21">21</a>  {
@@ -72,40 +72,40 @@
 <a class="jxr_linenumber" name="62" href="#62">62</a>        <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
 <a class="jxr_linenumber" name="63" href="#63">63</a>      }
 <a class="jxr_linenumber" name="64" href="#64">64</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
-<a class="jxr_linenumber" name="65" href="#65">65</a>      <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="66" href="#66">66</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor)
+<a class="jxr_linenumber" name="65" href="#65">65</a>      <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="66" href="#66">66</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
 <a class="jxr_linenumber" name="67" href="#67">67</a>      {
-<a class="jxr_linenumber" name="68" href="#68">68</a>        <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="69" href="#69">69</a>        m_taskMonitor = taskMonitor;
-<a class="jxr_linenumber" name="70" href="#70">70</a>        m_taskMonitor__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="68" href="#68">68</a>        <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="69" href="#69">69</a>        m_filter = filter;
+<a class="jxr_linenumber" name="70" href="#70">70</a>        m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="71" href="#71">71</a>      }
-<a class="jxr_linenumber" name="72" href="#72">72</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> getTaskMonitor()
+<a class="jxr_linenumber" name="72" href="#72">72</a>      <strong class="jxr_keyword">public</strong> String getFilter()
 <a class="jxr_linenumber" name="73" href="#73">73</a>      {
-<a class="jxr_linenumber" name="74" href="#74">74</a>        <strong class="jxr_keyword">return</strong> m_taskMonitor;
+<a class="jxr_linenumber" name="74" href="#74">74</a>        <strong class="jxr_keyword">return</strong> m_filter;
 <a class="jxr_linenumber" name="75" href="#75">75</a>      }
-<a class="jxr_linenumber" name="76" href="#76">76</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> m_taskMonitor;
-<a class="jxr_linenumber" name="77" href="#77">77</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getTaskMonitor__IsNotDefault()
+<a class="jxr_linenumber" name="76" href="#76">76</a>      <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="77" href="#77">77</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
 <a class="jxr_linenumber" name="78" href="#78">78</a>      {
-<a class="jxr_linenumber" name="79" href="#79">79</a>        <strong class="jxr_keyword">return</strong> m_taskMonitor__IsNotDefault;
+<a class="jxr_linenumber" name="79" href="#79">79</a>        <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
 <a class="jxr_linenumber" name="80" href="#80">80</a>      }
-<a class="jxr_linenumber" name="81" href="#81">81</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_taskMonitor__IsNotDefault;
-<a class="jxr_linenumber" name="82" href="#82">82</a>      <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="83" href="#83">83</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="81" href="#81">81</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="82" href="#82">82</a>      <em class="jxr_comment">// 25, 1</em>
+<a class="jxr_linenumber" name="83" href="#83">83</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor)
 <a class="jxr_linenumber" name="84" href="#84">84</a>      {
-<a class="jxr_linenumber" name="85" href="#85">85</a>        <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="86" href="#86">86</a>        m_filter = filter;
-<a class="jxr_linenumber" name="87" href="#87">87</a>        m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="85" href="#85">85</a>        <em class="jxr_comment">// 25, 1</em>
+<a class="jxr_linenumber" name="86" href="#86">86</a>        m_taskMonitor = taskMonitor;
+<a class="jxr_linenumber" name="87" href="#87">87</a>        m_taskMonitor__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="88" href="#88">88</a>      }
-<a class="jxr_linenumber" name="89" href="#89">89</a>      <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="89" href="#89">89</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> getTaskMonitor()
 <a class="jxr_linenumber" name="90" href="#90">90</a>      {
-<a class="jxr_linenumber" name="91" href="#91">91</a>        <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="91" href="#91">91</a>        <strong class="jxr_keyword">return</strong> m_taskMonitor;
 <a class="jxr_linenumber" name="92" href="#92">92</a>      }
-<a class="jxr_linenumber" name="93" href="#93">93</a>      <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="94" href="#94">94</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="93" href="#93">93</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> m_taskMonitor;
+<a class="jxr_linenumber" name="94" href="#94">94</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getTaskMonitor__IsNotDefault()
 <a class="jxr_linenumber" name="95" href="#95">95</a>      {
-<a class="jxr_linenumber" name="96" href="#96">96</a>        <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="96" href="#96">96</a>        <strong class="jxr_keyword">return</strong> m_taskMonitor__IsNotDefault;
 <a class="jxr_linenumber" name="97" href="#97">97</a>      }
-<a class="jxr_linenumber" name="98" href="#98">98</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="98" href="#98">98</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_taskMonitor__IsNotDefault;
 <a class="jxr_linenumber" name="99" href="#99">99</a>    }
 <a class="jxr_linenumber" name="100" href="#100">100</a>   @Override
 <a class="jxr_linenumber" name="101" href="#101">101</a>   <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -124,17 +124,17 @@
 <a class="jxr_linenumber" name="114" href="#114">114</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="115" href="#115">115</a>   }
 <a class="jxr_linenumber" name="116" href="#116">116</a>   
-<a class="jxr_linenumber" name="117" href="#117">117</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
-<a class="jxr_linenumber" name="118" href="#118">118</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> p_taskMonitor)
+<a class="jxr_linenumber" name="117" href="#117">117</a>   <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="118" href="#118">118</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFilter(String p_filter)
 <a class="jxr_linenumber" name="119" href="#119">119</a>   {
-<a class="jxr_linenumber" name="120" href="#120">120</a>     (getImplData()).setTaskMonitor(p_taskMonitor);
+<a class="jxr_linenumber" name="120" href="#120">120</a>     (getImplData()).setFilter(p_filter);
 <a class="jxr_linenumber" name="121" href="#121">121</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="122" href="#122">122</a>   }
 <a class="jxr_linenumber" name="123" href="#123">123</a>   
-<a class="jxr_linenumber" name="124" href="#124">124</a>   <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="125" href="#125">125</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="124" href="#124">124</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
+<a class="jxr_linenumber" name="125" href="#125">125</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl setTaskMonitor(<a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> p_taskMonitor)
 <a class="jxr_linenumber" name="126" href="#126">126</a>   {
-<a class="jxr_linenumber" name="127" href="#127">127</a>     (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="127" href="#127">127</a>     (getImplData()).setTaskMonitor(p_taskMonitor);
 <a class="jxr_linenumber" name="128" href="#128">128</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="129" href="#129">129</a>   }
 <a class="jxr_linenumber" name="130" href="#130">130</a>   

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
index ffeb624..1fe1872 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmplImpl.html
@@ -26,21 +26,21 @@
 <a class="jxr_linenumber" name="16" href="#16">16</a>  
 <a class="jxr_linenumber" name="17" href="#17">17</a>  {
 <a class="jxr_linenumber" name="18" href="#18">18</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
-<a class="jxr_linenumber" name="19" href="#19">19</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
-<a class="jxr_linenumber" name="20" href="#20">20</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="19" href="#19">19</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="20" href="#20">20</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/monitoring/TaskMonitor.html">TaskMonitor</a> taskMonitor;
 <a class="jxr_linenumber" name="21" href="#21">21</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.common.TaskMonitorTmpl.ImplData p_implData)
 <a class="jxr_linenumber" name="22" href="#22">22</a>    {
 <a class="jxr_linenumber" name="23" href="#23">23</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
 <a class="jxr_linenumber" name="24" href="#24">24</a>      {
 <a class="jxr_linenumber" name="25" href="#25">25</a>        p_implData.setFormat(<span class="jxr_string">"html"</span>);
 <a class="jxr_linenumber" name="26" href="#26">26</a>      }
-<a class="jxr_linenumber" name="27" href="#27">27</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getTaskMonitor__IsNotDefault())
+<a class="jxr_linenumber" name="27" href="#27">27</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
 <a class="jxr_linenumber" name="28" href="#28">28</a>      {
-<a class="jxr_linenumber" name="29" href="#29">29</a>        p_implData.setTaskMonitor(TaskMonitor.get());
+<a class="jxr_linenumber" name="29" href="#29">29</a>        p_implData.setFilter(<span class="jxr_string">"general"</span>);
 <a class="jxr_linenumber" name="30" href="#30">30</a>      }
-<a class="jxr_linenumber" name="31" href="#31">31</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="31" href="#31">31</a>      <strong class="jxr_keyword">if</strong>(! p_implData.getTaskMonitor__IsNotDefault())
 <a class="jxr_linenumber" name="32" href="#32">32</a>      {
-<a class="jxr_linenumber" name="33" href="#33">33</a>        p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="33" href="#33">33</a>        p_implData.setTaskMonitor(TaskMonitor.get());
 <a class="jxr_linenumber" name="34" href="#34">34</a>      }
 <a class="jxr_linenumber" name="35" href="#35">35</a>      <strong class="jxr_keyword">return</strong> p_implData;
 <a class="jxr_linenumber" name="36" href="#36">36</a>    }
@@ -48,8 +48,8 @@
 <a class="jxr_linenumber" name="38" href="#38">38</a>    {
 <a class="jxr_linenumber" name="39" href="#39">39</a>      <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
 <a class="jxr_linenumber" name="40" href="#40">40</a>      format = p_implData.getFormat();
-<a class="jxr_linenumber" name="41" href="#41">41</a>      taskMonitor = p_implData.getTaskMonitor();
-<a class="jxr_linenumber" name="42" href="#42">42</a>      filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="41" href="#41">41</a>      filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="42" href="#42">42</a>      taskMonitor = p_implData.getTaskMonitor();
 <a class="jxr_linenumber" name="43" href="#43">43</a>    }
 <a class="jxr_linenumber" name="44" href="#44">44</a>    
 <a class="jxr_linenumber" name="45" href="#45">45</a>    @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
index e42d1c9..4f47402 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html
@@ -69,15 +69,15 @@
 <a class="jxr_linenumber" name="59" href="#59">59</a>    requiredArguments = {
 <a class="jxr_linenumber" name="60" href="#60">60</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"master"</span>, type = <span class="jxr_string">"HMaster"</span>)},
 <a class="jxr_linenumber" name="61" href="#61">61</a>    optionalArguments = {
-<a class="jxr_linenumber" name="62" href="#62">62</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"deadServers"</span>, type = <span class="jxr_string">"Set&lt;ServerName&gt;"</span>),
-<a class="jxr_linenumber" name="63" href="#63">63</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"metaLocation"</span>, type = <span class="jxr_string">"ServerName"</span>),
-<a class="jxr_linenumber" name="64" href="#64">64</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="65" href="#65">65</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"catalogJanitorEnabled"</span>, type = <span class="jxr_string">"boolean"</span>),
-<a class="jxr_linenumber" name="66" href="#66">66</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"frags"</span>, type = <span class="jxr_string">"Map&lt;String,Integer&gt;"</span>),
-<a class="jxr_linenumber" name="67" href="#67">67</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
-<a class="jxr_linenumber" name="68" href="#68">68</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"assignmentManager"</span>, type = <span class="jxr_string">"AssignmentManager"</span>),
-<a class="jxr_linenumber" name="69" href="#69">69</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"serverManager"</span>, type = <span class="jxr_string">"ServerManager"</span>),
-<a class="jxr_linenumber" name="70" href="#70">70</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"servers"</span>, type = <span class="jxr_string">"List&lt;ServerName&gt;"</span>)})
+<a class="jxr_linenumber" name="62" href="#62">62</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"filter"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="63" href="#63">63</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"format"</span>, type = <span class="jxr_string">"String"</span>),
+<a class="jxr_linenumber" name="64" href="#64">64</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"assignmentManager"</span>, type = <span class="jxr_string">"AssignmentManager"</span>),
+<a class="jxr_linenumber" name="65" href="#65">65</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"servers"</span>, type = <span class="jxr_string">"List&lt;ServerName&gt;"</span>),
+<a class="jxr_linenumber" name="66" href="#66">66</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"deadServers"</span>, type = <span class="jxr_string">"Set&lt;ServerName&gt;"</span>),
+<a class="jxr_linenumber" name="67" href="#67">67</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"frags"</span>, type = <span class="jxr_string">"Map&lt;String,Integer&gt;"</span>),
+<a class="jxr_linenumber" name="68" href="#68">68</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"serverManager"</span>, type = <span class="jxr_string">"ServerManager"</span>),
+<a class="jxr_linenumber" name="69" href="#69">69</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"catalogJanitorEnabled"</span>, type = <span class="jxr_string">"boolean"</span>),
+<a class="jxr_linenumber" name="70" href="#70">70</a>      @org.jamon.annotations.Argument(name = <span class="jxr_string">"metaLocation"</span>, type = <span class="jxr_string">"ServerName"</span>)})
 <a class="jxr_linenumber" name="71" href="#71">71</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html">MasterStatusTmpl</a>
 <a class="jxr_linenumber" name="72" href="#72">72</a>    <strong class="jxr_keyword">extends</strong> org.jamon.AbstractTemplateProxy
 <a class="jxr_linenumber" name="73" href="#73">73</a>  {
@@ -118,159 +118,159 @@
 <a class="jxr_linenumber" name="108" href="#108">108</a>       <strong class="jxr_keyword">return</strong> m_master;
 <a class="jxr_linenumber" name="109" href="#109">109</a>     }
 <a class="jxr_linenumber" name="110" href="#110">110</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html">HMaster</a> m_master;
-<a class="jxr_linenumber" name="111" href="#111">111</a>     <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDeadServers(Set&lt;ServerName&gt; deadServers)
+<a class="jxr_linenumber" name="111" href="#111">111</a>     <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
 <a class="jxr_linenumber" name="113" href="#113">113</a>     {
-<a class="jxr_linenumber" name="114" href="#114">114</a>       <em class="jxr_comment">// 24, 1</em>
-<a class="jxr_linenumber" name="115" href="#115">115</a>       m_deadServers = deadServers;
-<a class="jxr_linenumber" name="116" href="#116">116</a>       m_deadServers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="114" href="#114">114</a>       <em class="jxr_comment">// 26, 1</em>
+<a class="jxr_linenumber" name="115" href="#115">115</a>       m_filter = filter;
+<a class="jxr_linenumber" name="116" href="#116">116</a>       m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="117" href="#117">117</a>     }
-<a class="jxr_linenumber" name="118" href="#118">118</a>     <strong class="jxr_keyword">public</strong> Set&lt;ServerName&gt; getDeadServers()
+<a class="jxr_linenumber" name="118" href="#118">118</a>     <strong class="jxr_keyword">public</strong> String getFilter()
 <a class="jxr_linenumber" name="119" href="#119">119</a>     {
-<a class="jxr_linenumber" name="120" href="#120">120</a>       <strong class="jxr_keyword">return</strong> m_deadServers;
+<a class="jxr_linenumber" name="120" href="#120">120</a>       <strong class="jxr_keyword">return</strong> m_filter;
 <a class="jxr_linenumber" name="121" href="#121">121</a>     }
-<a class="jxr_linenumber" name="122" href="#122">122</a>     <strong class="jxr_keyword">private</strong> Set&lt;ServerName&gt; m_deadServers;
-<a class="jxr_linenumber" name="123" href="#123">123</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getDeadServers__IsNotDefault()
+<a class="jxr_linenumber" name="122" href="#122">122</a>     <strong class="jxr_keyword">private</strong> String m_filter;
+<a class="jxr_linenumber" name="123" href="#123">123</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
 <a class="jxr_linenumber" name="124" href="#124">124</a>     {
-<a class="jxr_linenumber" name="125" href="#125">125</a>       <strong class="jxr_keyword">return</strong> m_deadServers__IsNotDefault;
+<a class="jxr_linenumber" name="125" href="#125">125</a>       <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
 <a class="jxr_linenumber" name="126" href="#126">126</a>     }
-<a class="jxr_linenumber" name="127" href="#127">127</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_deadServers__IsNotDefault;
-<a class="jxr_linenumber" name="128" href="#128">128</a>     <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation)
+<a class="jxr_linenumber" name="127" href="#127">127</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="128" href="#128">128</a>     <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="129" href="#129">129</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
 <a class="jxr_linenumber" name="130" href="#130">130</a>     {
-<a class="jxr_linenumber" name="131" href="#131">131</a>       <em class="jxr_comment">// 22, 1</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a>       m_metaLocation = metaLocation;
-<a class="jxr_linenumber" name="133" href="#133">133</a>       m_metaLocation__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="131" href="#131">131</a>       <em class="jxr_comment">// 27, 1</em>
+<a class="jxr_linenumber" name="132" href="#132">132</a>       m_format = format;
+<a class="jxr_linenumber" name="133" href="#133">133</a>       m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="134" href="#134">134</a>     }
-<a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> getMetaLocation()
+<a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">public</strong> String getFormat()
 <a class="jxr_linenumber" name="136" href="#136">136</a>     {
-<a class="jxr_linenumber" name="137" href="#137">137</a>       <strong class="jxr_keyword">return</strong> m_metaLocation;
+<a class="jxr_linenumber" name="137" href="#137">137</a>       <strong class="jxr_keyword">return</strong> m_format;
 <a class="jxr_linenumber" name="138" href="#138">138</a>     }
-<a class="jxr_linenumber" name="139" href="#139">139</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> m_metaLocation;
-<a class="jxr_linenumber" name="140" href="#140">140</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getMetaLocation__IsNotDefault()
+<a class="jxr_linenumber" name="139" href="#139">139</a>     <strong class="jxr_keyword">private</strong> String m_format;
+<a class="jxr_linenumber" name="140" href="#140">140</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
 <a class="jxr_linenumber" name="141" href="#141">141</a>     {
-<a class="jxr_linenumber" name="142" href="#142">142</a>       <strong class="jxr_keyword">return</strong> m_metaLocation__IsNotDefault;
+<a class="jxr_linenumber" name="142" href="#142">142</a>       <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
 <a class="jxr_linenumber" name="143" href="#143">143</a>     }
-<a class="jxr_linenumber" name="144" href="#144">144</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_metaLocation__IsNotDefault;
-<a class="jxr_linenumber" name="145" href="#145">145</a>     <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="146" href="#146">146</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFilter(String filter)
+<a class="jxr_linenumber" name="144" href="#144">144</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="145" href="#145">145</a>     <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="146" href="#146">146</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager)
 <a class="jxr_linenumber" name="147" href="#147">147</a>     {
-<a class="jxr_linenumber" name="148" href="#148">148</a>       <em class="jxr_comment">// 26, 1</em>
-<a class="jxr_linenumber" name="149" href="#149">149</a>       m_filter = filter;
-<a class="jxr_linenumber" name="150" href="#150">150</a>       m_filter__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="148" href="#148">148</a>       <em class="jxr_comment">// 29, 1</em>
+<a class="jxr_linenumber" name="149" href="#149">149</a>       m_assignmentManager = assignmentManager;
+<a class="jxr_linenumber" name="150" href="#150">150</a>       m_assignmentManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="151" href="#151">151</a>     }
-<a class="jxr_linenumber" name="152" href="#152">152</a>     <strong class="jxr_keyword">public</strong> String getFilter()
+<a class="jxr_linenumber" name="152" href="#152">152</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> getAssignmentManager()
 <a class="jxr_linenumber" name="153" href="#153">153</a>     {
-<a class="jxr_linenumber" name="154" href="#154">154</a>       <strong class="jxr_keyword">return</strong> m_filter;
+<a class="jxr_linenumber" name="154" href="#154">154</a>       <strong class="jxr_keyword">return</strong> m_assignmentManager;
 <a class="jxr_linenumber" name="155" href="#155">155</a>     }
-<a class="jxr_linenumber" name="156" href="#156">156</a>     <strong class="jxr_keyword">private</strong> String m_filter;
-<a class="jxr_linenumber" name="157" href="#157">157</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFilter__IsNotDefault()
+<a class="jxr_linenumber" name="156" href="#156">156</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> m_assignmentManager;
+<a class="jxr_linenumber" name="157" href="#157">157</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getAssignmentManager__IsNotDefault()
 <a class="jxr_linenumber" name="158" href="#158">158</a>     {
-<a class="jxr_linenumber" name="159" href="#159">159</a>       <strong class="jxr_keyword">return</strong> m_filter__IsNotDefault;
+<a class="jxr_linenumber" name="159" href="#159">159</a>       <strong class="jxr_keyword">return</strong> m_assignmentManager__IsNotDefault;
 <a class="jxr_linenumber" name="160" href="#160">160</a>     }
-<a class="jxr_linenumber" name="161" href="#161">161</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_filter__IsNotDefault;
-<a class="jxr_linenumber" name="162" href="#162">162</a>     <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="163" href="#163">163</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled)
+<a class="jxr_linenumber" name="161" href="#161">161</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="162" href="#162">162</a>     <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="163" href="#163">163</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServers(List&lt;ServerName&gt; servers)
 <a class="jxr_linenumber" name="164" href="#164">164</a>     {
-<a class="jxr_linenumber" name="165" href="#165">165</a>       <em class="jxr_comment">// 25, 1</em>
-<a class="jxr_linenumber" name="166" href="#166">166</a>       m_catalogJanitorEnabled = catalogJanitorEnabled;
-<a class="jxr_linenumber" name="167" href="#167">167</a>       m_catalogJanitorEnabled__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="165" href="#165">165</a>       <em class="jxr_comment">// 23, 1</em>
+<a class="jxr_linenumber" name="166" href="#166">166</a>       m_servers = servers;
+<a class="jxr_linenumber" name="167" href="#167">167</a>       m_servers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="168" href="#168">168</a>     }
-<a class="jxr_linenumber" name="169" href="#169">169</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled()
+<a class="jxr_linenumber" name="169" href="#169">169</a>     <strong class="jxr_keyword">public</strong> List&lt;ServerName&gt; getServers()
 <a class="jxr_linenumber" name="170" href="#170">170</a>     {
-<a class="jxr_linenumber" name="171" href="#171">171</a>       <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled;
+<a class="jxr_linenumber" name="171" href="#171">171</a>       <strong class="jxr_keyword">return</strong> m_servers;
 <a class="jxr_linenumber" name="172" href="#172">172</a>     }
-<a class="jxr_linenumber" name="173" href="#173">173</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled;
-<a class="jxr_linenumber" name="174" href="#174">174</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled__IsNotDefault()
+<a class="jxr_linenumber" name="173" href="#173">173</a>     <strong class="jxr_keyword">private</strong> List&lt;ServerName&gt; m_servers;
+<a class="jxr_linenumber" name="174" href="#174">174</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServers__IsNotDefault()
 <a class="jxr_linenumber" name="175" href="#175">175</a>     {
-<a class="jxr_linenumber" name="176" href="#176">176</a>       <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled__IsNotDefault;
+<a class="jxr_linenumber" name="176" href="#176">176</a>       <strong class="jxr_keyword">return</strong> m_servers__IsNotDefault;
 <a class="jxr_linenumber" name="177" href="#177">177</a>     }
-<a class="jxr_linenumber" name="178" href="#178">178</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled__IsNotDefault;
-<a class="jxr_linenumber" name="179" href="#179">179</a>     <em class="jxr_comment">// 21, 1</em>
-<a class="jxr_linenumber" name="180" href="#180">180</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFrags(Map&lt;String,Integer&gt; frags)
+<a class="jxr_linenumber" name="178" href="#178">178</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_servers__IsNotDefault;
+<a class="jxr_linenumber" name="179" href="#179">179</a>     <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="180" href="#180">180</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDeadServers(Set&lt;ServerName&gt; deadServers)
 <a class="jxr_linenumber" name="181" href="#181">181</a>     {
-<a class="jxr_linenumber" name="182" href="#182">182</a>       <em class="jxr_comment">// 21, 1</em>
-<a class="jxr_linenumber" name="183" href="#183">183</a>       m_frags = frags;
-<a class="jxr_linenumber" name="184" href="#184">184</a>       m_frags__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="182" href="#182">182</a>       <em class="jxr_comment">// 24, 1</em>
+<a class="jxr_linenumber" name="183" href="#183">183</a>       m_deadServers = deadServers;
+<a class="jxr_linenumber" name="184" href="#184">184</a>       m_deadServers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="185" href="#185">185</a>     }
-<a class="jxr_linenumber" name="186" href="#186">186</a>     <strong class="jxr_keyword">public</strong> Map&lt;String,Integer&gt; getFrags()
+<a class="jxr_linenumber" name="186" href="#186">186</a>     <strong class="jxr_keyword">public</strong> Set&lt;ServerName&gt; getDeadServers()
 <a class="jxr_linenumber" name="187" href="#187">187</a>     {
-<a class="jxr_linenumber" name="188" href="#188">188</a>       <strong class="jxr_keyword">return</strong> m_frags;
+<a class="jxr_linenumber" name="188" href="#188">188</a>       <strong class="jxr_keyword">return</strong> m_deadServers;
 <a class="jxr_linenumber" name="189" href="#189">189</a>     }
-<a class="jxr_linenumber" name="190" href="#190">190</a>     <strong class="jxr_keyword">private</strong> Map&lt;String,Integer&gt; m_frags;
-<a class="jxr_linenumber" name="191" href="#191">191</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFrags__IsNotDefault()
+<a class="jxr_linenumber" name="190" href="#190">190</a>     <strong class="jxr_keyword">private</strong> Set&lt;ServerName&gt; m_deadServers;
+<a class="jxr_linenumber" name="191" href="#191">191</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getDeadServers__IsNotDefault()
 <a class="jxr_linenumber" name="192" href="#192">192</a>     {
-<a class="jxr_linenumber" name="193" href="#193">193</a>       <strong class="jxr_keyword">return</strong> m_frags__IsNotDefault;
+<a class="jxr_linenumber" name="193" href="#193">193</a>       <strong class="jxr_keyword">return</strong> m_deadServers__IsNotDefault;
 <a class="jxr_linenumber" name="194" href="#194">194</a>     }
-<a class="jxr_linenumber" name="195" href="#195">195</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_frags__IsNotDefault;
-<a class="jxr_linenumber" name="196" href="#196">196</a>     <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="197" href="#197">197</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFormat(String format)
+<a class="jxr_linenumber" name="195" href="#195">195</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_deadServers__IsNotDefault;
+<a class="jxr_linenumber" name="196" href="#196">196</a>     <em class="jxr_comment">// 21, 1</em>
+<a class="jxr_linenumber" name="197" href="#197">197</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFrags(Map&lt;String,Integer&gt; frags)
 <a class="jxr_linenumber" name="198" href="#198">198</a>     {
-<a class="jxr_linenumber" name="199" href="#199">199</a>       <em class="jxr_comment">// 27, 1</em>
-<a class="jxr_linenumber" name="200" href="#200">200</a>       m_format = format;
-<a class="jxr_linenumber" name="201" href="#201">201</a>       m_format__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="199" href="#199">199</a>       <em class="jxr_comment">// 21, 1</em>
+<a class="jxr_linenumber" name="200" href="#200">200</a>       m_frags = frags;
+<a class="jxr_linenumber" name="201" href="#201">201</a>       m_frags__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="202" href="#202">202</a>     }
-<a class="jxr_linenumber" name="203" href="#203">203</a>     <strong class="jxr_keyword">public</strong> String getFormat()
+<a class="jxr_linenumber" name="203" href="#203">203</a>     <strong class="jxr_keyword">public</strong> Map&lt;String,Integer&gt; getFrags()
 <a class="jxr_linenumber" name="204" href="#204">204</a>     {
-<a class="jxr_linenumber" name="205" href="#205">205</a>       <strong class="jxr_keyword">return</strong> m_format;
+<a class="jxr_linenumber" name="205" href="#205">205</a>       <strong class="jxr_keyword">return</strong> m_frags;
 <a class="jxr_linenumber" name="206" href="#206">206</a>     }
-<a class="jxr_linenumber" name="207" href="#207">207</a>     <strong class="jxr_keyword">private</strong> String m_format;
-<a class="jxr_linenumber" name="208" href="#208">208</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFormat__IsNotDefault()
+<a class="jxr_linenumber" name="207" href="#207">207</a>     <strong class="jxr_keyword">private</strong> Map&lt;String,Integer&gt; m_frags;
+<a class="jxr_linenumber" name="208" href="#208">208</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getFrags__IsNotDefault()
 <a class="jxr_linenumber" name="209" href="#209">209</a>     {
-<a class="jxr_linenumber" name="210" href="#210">210</a>       <strong class="jxr_keyword">return</strong> m_format__IsNotDefault;
+<a class="jxr_linenumber" name="210" href="#210">210</a>       <strong class="jxr_keyword">return</strong> m_frags__IsNotDefault;
 <a class="jxr_linenumber" name="211" href="#211">211</a>     }
-<a class="jxr_linenumber" name="212" href="#212">212</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_format__IsNotDefault;
-<a class="jxr_linenumber" name="213" href="#213">213</a>     <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="214" href="#214">214</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager)
+<a class="jxr_linenumber" name="212" href="#212">212</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_frags__IsNotDefault;
+<a class="jxr_linenumber" name="213" href="#213">213</a>     <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="214" href="#214">214</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager)
 <a class="jxr_linenumber" name="215" href="#215">215</a>     {
-<a class="jxr_linenumber" name="216" href="#216">216</a>       <em class="jxr_comment">// 29, 1</em>
-<a class="jxr_linenumber" name="217" href="#217">217</a>       m_assignmentManager = assignmentManager;
-<a class="jxr_linenumber" name="218" href="#218">218</a>       m_assignmentManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="216" href="#216">216</a>       <em class="jxr_comment">// 28, 1</em>
+<a class="jxr_linenumber" name="217" href="#217">217</a>       m_serverManager = serverManager;
+<a class="jxr_linenumber" name="218" href="#218">218</a>       m_serverManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="219" href="#219">219</a>     }
-<a class="jxr_linenumber" name="220" href="#220">220</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> getAssignmentManager()
+<a class="jxr_linenumber" name="220" href="#220">220</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> getServerManager()
 <a class="jxr_linenumber" name="221" href="#221">221</a>     {
-<a class="jxr_linenumber" name="222" href="#222">222</a>       <strong class="jxr_keyword">return</strong> m_assignmentManager;
+<a class="jxr_linenumber" name="222" href="#222">222</a>       <strong class="jxr_keyword">return</strong> m_serverManager;
 <a class="jxr_linenumber" name="223" href="#223">223</a>     }
-<a class="jxr_linenumber" name="224" href="#224">224</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> m_assignmentManager;
-<a class="jxr_linenumber" name="225" href="#225">225</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getAssignmentManager__IsNotDefault()
+<a class="jxr_linenumber" name="224" href="#224">224</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> m_serverManager;
+<a class="jxr_linenumber" name="225" href="#225">225</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServerManager__IsNotDefault()
 <a class="jxr_linenumber" name="226" href="#226">226</a>     {
-<a class="jxr_linenumber" name="227" href="#227">227</a>       <strong class="jxr_keyword">return</strong> m_assignmentManager__IsNotDefault;
+<a class="jxr_linenumber" name="227" href="#227">227</a>       <strong class="jxr_keyword">return</strong> m_serverManager__IsNotDefault;
 <a class="jxr_linenumber" name="228" href="#228">228</a>     }
-<a class="jxr_linenumber" name="229" href="#229">229</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_assignmentManager__IsNotDefault;
-<a class="jxr_linenumber" name="230" href="#230">230</a>     <em class="jxr_comment">// 28, 1</em>
-<a class="jxr_linenumber" name="231" href="#231">231</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager)
+<a class="jxr_linenumber" name="229" href="#229">229</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_serverManager__IsNotDefault;
+<a class="jxr_linenumber" name="230" href="#230">230</a>     <em class="jxr_comment">// 25, 1</em>
+<a class="jxr_linenumber" name="231" href="#231">231</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled)
 <a class="jxr_linenumber" name="232" href="#232">232</a>     {
-<a class="jxr_linenumber" name="233" href="#233">233</a>       <em class="jxr_comment">// 28, 1</em>
-<a class="jxr_linenumber" name="234" href="#234">234</a>       m_serverManager = serverManager;
-<a class="jxr_linenumber" name="235" href="#235">235</a>       m_serverManager__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="233" href="#233">233</a>       <em class="jxr_comment">// 25, 1</em>
+<a class="jxr_linenumber" name="234" href="#234">234</a>       m_catalogJanitorEnabled = catalogJanitorEnabled;
+<a class="jxr_linenumber" name="235" href="#235">235</a>       m_catalogJanitorEnabled__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="236" href="#236">236</a>     }
-<a class="jxr_linenumber" name="237" href="#237">237</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> getServerManager()
+<a class="jxr_linenumber" name="237" href="#237">237</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled()
 <a class="jxr_linenumber" name="238" href="#238">238</a>     {
-<a class="jxr_linenumber" name="239" href="#239">239</a>       <strong class="jxr_keyword">return</strong> m_serverManager;
+<a class="jxr_linenumber" name="239" href="#239">239</a>       <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled;
 <a class="jxr_linenumber" name="240" href="#240">240</a>     }
-<a class="jxr_linenumber" name="241" href="#241">241</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> m_serverManager;
-<a class="jxr_linenumber" name="242" href="#242">242</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServerManager__IsNotDefault()
+<a class="jxr_linenumber" name="241" href="#241">241</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled;
+<a class="jxr_linenumber" name="242" href="#242">242</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getCatalogJanitorEnabled__IsNotDefault()
 <a class="jxr_linenumber" name="243" href="#243">243</a>     {
-<a class="jxr_linenumber" name="244" href="#244">244</a>       <strong class="jxr_keyword">return</strong> m_serverManager__IsNotDefault;
+<a class="jxr_linenumber" name="244" href="#244">244</a>       <strong class="jxr_keyword">return</strong> m_catalogJanitorEnabled__IsNotDefault;
 <a class="jxr_linenumber" name="245" href="#245">245</a>     }
-<a class="jxr_linenumber" name="246" href="#246">246</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_serverManager__IsNotDefault;
-<a class="jxr_linenumber" name="247" href="#247">247</a>     <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="248" href="#248">248</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setServers(List&lt;ServerName&gt; servers)
+<a class="jxr_linenumber" name="246" href="#246">246</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_catalogJanitorEnabled__IsNotDefault;
+<a class="jxr_linenumber" name="247" href="#247">247</a>     <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="248" href="#248">248</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation)
 <a class="jxr_linenumber" name="249" href="#249">249</a>     {
-<a class="jxr_linenumber" name="250" href="#250">250</a>       <em class="jxr_comment">// 23, 1</em>
-<a class="jxr_linenumber" name="251" href="#251">251</a>       m_servers = servers;
-<a class="jxr_linenumber" name="252" href="#252">252</a>       m_servers__IsNotDefault = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="250" href="#250">250</a>       <em class="jxr_comment">// 22, 1</em>
+<a class="jxr_linenumber" name="251" href="#251">251</a>       m_metaLocation = metaLocation;
+<a class="jxr_linenumber" name="252" href="#252">252</a>       m_metaLocation__IsNotDefault = <strong class="jxr_keyword">true</strong>;
 <a class="jxr_linenumber" name="253" href="#253">253</a>     }
-<a class="jxr_linenumber" name="254" href="#254">254</a>     <strong class="jxr_keyword">public</strong> List&lt;ServerName&gt; getServers()
+<a class="jxr_linenumber" name="254" href="#254">254</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> getMetaLocation()
 <a class="jxr_linenumber" name="255" href="#255">255</a>     {
-<a class="jxr_linenumber" name="256" href="#256">256</a>       <strong class="jxr_keyword">return</strong> m_servers;
+<a class="jxr_linenumber" name="256" href="#256">256</a>       <strong class="jxr_keyword">return</strong> m_metaLocation;
 <a class="jxr_linenumber" name="257" href="#257">257</a>     }
-<a class="jxr_linenumber" name="258" href="#258">258</a>     <strong class="jxr_keyword">private</strong> List&lt;ServerName&gt; m_servers;
-<a class="jxr_linenumber" name="259" href="#259">259</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getServers__IsNotDefault()
+<a class="jxr_linenumber" name="258" href="#258">258</a>     <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> m_metaLocation;
+<a class="jxr_linenumber" name="259" href="#259">259</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> getMetaLocation__IsNotDefault()
 <a class="jxr_linenumber" name="260" href="#260">260</a>     {
-<a class="jxr_linenumber" name="261" href="#261">261</a>       <strong class="jxr_keyword">return</strong> m_servers__IsNotDefault;
+<a class="jxr_linenumber" name="261" href="#261">261</a>       <strong class="jxr_keyword">return</strong> m_metaLocation__IsNotDefault;
 <a class="jxr_linenumber" name="262" href="#262">262</a>     }
-<a class="jxr_linenumber" name="263" href="#263">263</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_servers__IsNotDefault;
+<a class="jxr_linenumber" name="263" href="#263">263</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> m_metaLocation__IsNotDefault;
 <a class="jxr_linenumber" name="264" href="#264">264</a>   }
 <a class="jxr_linenumber" name="265" href="#265">265</a>   @Override
 <a class="jxr_linenumber" name="266" href="#266">266</a>   <strong class="jxr_keyword">protected</strong> org.jamon.AbstractTemplateProxy.ImplData makeImplData()
@@ -282,66 +282,66 @@
 <a class="jxr_linenumber" name="272" href="#272">272</a>     <strong class="jxr_keyword">return</strong> (ImplData) <strong class="jxr_keyword">super</strong>.getImplData();
 <a class="jxr_linenumber" name="273" href="#273">273</a>   }
 <a class="jxr_linenumber" name="274" href="#274">274</a>   
-<a class="jxr_linenumber" name="275" href="#275">275</a>   <strong class="jxr_keyword">protected</strong> Set&lt;ServerName&gt; deadServers;
-<a class="jxr_linenumber" name="276" href="#276">276</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)
+<a class="jxr_linenumber" name="275" href="#275">275</a>   <strong class="jxr_keyword">protected</strong> String filter;
+<a class="jxr_linenumber" name="276" href="#276">276</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)
 <a class="jxr_linenumber" name="277" href="#277">277</a>   {
-<a class="jxr_linenumber" name="278" href="#278">278</a>     (getImplData()).setDeadServers(p_deadServers);
+<a class="jxr_linenumber" name="278" href="#278">278</a>     (getImplData()).setFilter(p_filter);
 <a class="jxr_linenumber" name="279" href="#279">279</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="280" href="#280">280</a>   }
 <a class="jxr_linenumber" name="281" href="#281">281</a>   
-<a class="jxr_linenumber" name="282" href="#282">282</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
-<a class="jxr_linenumber" name="283" href="#283">283</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> p_metaLocation)
+<a class="jxr_linenumber" name="282" href="#282">282</a>   <strong class="jxr_keyword">protected</strong> String format;
+<a class="jxr_linenumber" name="283" href="#283">283</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)
 <a class="jxr_linenumber" name="284" href="#284">284</a>   {
-<a class="jxr_linenumber" name="285" href="#285">285</a>     (getImplData()).setMetaLocation(p_metaLocation);
+<a class="jxr_linenumber" name="285" href="#285">285</a>     (getImplData()).setFormat(p_format);
 <a class="jxr_linenumber" name="286" href="#286">286</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="287" href="#287">287</a>   }
 <a class="jxr_linenumber" name="288" href="#288">288</a>   
-<a class="jxr_linenumber" name="289" href="#289">289</a>   <strong class="jxr_keyword">protected</strong> String filter;
-<a class="jxr_linenumber" name="290" href="#290">290</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFilter(String p_filter)
+<a class="jxr_linenumber" name="289" href="#289">289</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="290" href="#290">290</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> p_assignmentManager)
 <a class="jxr_linenumber" name="291" href="#291">291</a>   {
-<a class="jxr_linenumber" name="292" href="#292">292</a>     (getImplData()).setFilter(p_filter);
+<a class="jxr_linenumber" name="292" href="#292">292</a>     (getImplData()).setAssignmentManager(p_assignmentManager);
 <a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="294" href="#294">294</a>   }
 <a class="jxr_linenumber" name="295" href="#295">295</a>   
-<a class="jxr_linenumber" name="296" href="#296">296</a>   <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
-<a class="jxr_linenumber" name="297" href="#297">297</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> p_catalogJanitorEnabled)
+<a class="jxr_linenumber" name="296" href="#296">296</a>   <strong class="jxr_keyword">protected</strong> List&lt;ServerName&gt; servers;
+<a class="jxr_linenumber" name="297" href="#297">297</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)
 <a class="jxr_linenumber" name="298" href="#298">298</a>   {
-<a class="jxr_linenumber" name="299" href="#299">299</a>     (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);
+<a class="jxr_linenumber" name="299" href="#299">299</a>     (getImplData()).setServers(p_servers);
 <a class="jxr_linenumber" name="300" href="#300">300</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="301" href="#301">301</a>   }
 <a class="jxr_linenumber" name="302" href="#302">302</a>   
-<a class="jxr_linenumber" name="303" href="#303">303</a>   <strong class="jxr_keyword">protected</strong> Map&lt;String,Integer&gt; frags;
-<a class="jxr_linenumber" name="304" href="#304">304</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)
+<a class="jxr_linenumber" name="303" href="#303">303</a>   <strong class="jxr_keyword">protected</strong> Set&lt;ServerName&gt; deadServers;
+<a class="jxr_linenumber" name="304" href="#304">304</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setDeadServers(Set&lt;ServerName&gt; p_deadServers)
 <a class="jxr_linenumber" name="305" href="#305">305</a>   {
-<a class="jxr_linenumber" name="306" href="#306">306</a>     (getImplData()).setFrags(p_frags);
+<a class="jxr_linenumber" name="306" href="#306">306</a>     (getImplData()).setDeadServers(p_deadServers);
 <a class="jxr_linenumber" name="307" href="#307">307</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="308" href="#308">308</a>   }
 <a class="jxr_linenumber" name="309" href="#309">309</a>   
-<a class="jxr_linenumber" name="310" href="#310">310</a>   <strong class="jxr_keyword">protected</strong> String format;
-<a class="jxr_linenumber" name="311" href="#311">311</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFormat(String p_format)
+<a class="jxr_linenumber" name="310" href="#310">310</a>   <strong class="jxr_keyword">protected</strong> Map&lt;String,Integer&gt; frags;
+<a class="jxr_linenumber" name="311" href="#311">311</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setFrags(Map&lt;String,Integer&gt; p_frags)
 <a class="jxr_linenumber" name="312" href="#312">312</a>   {
-<a class="jxr_linenumber" name="313" href="#313">313</a>     (getImplData()).setFormat(p_format);
+<a class="jxr_linenumber" name="313" href="#313">313</a>     (getImplData()).setFrags(p_frags);
 <a class="jxr_linenumber" name="314" href="#314">314</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="315" href="#315">315</a>   }
 <a class="jxr_linenumber" name="316" href="#316">316</a>   
-<a class="jxr_linenumber" name="317" href="#317">317</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
-<a class="jxr_linenumber" name="318" href="#318">318</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setAssignmentManager(<a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> p_assignmentManager)
+<a class="jxr_linenumber" name="317" href="#317">317</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
+<a class="jxr_linenumber" name="318" href="#318">318</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> p_serverManager)
 <a class="jxr_linenumber" name="319" href="#319">319</a>   {
-<a class="jxr_linenumber" name="320" href="#320">320</a>     (getImplData()).setAssignmentManager(p_assignmentManager);
+<a class="jxr_linenumber" name="320" href="#320">320</a>     (getImplData()).setServerManager(p_serverManager);
 <a class="jxr_linenumber" name="321" href="#321">321</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="322" href="#322">322</a>   }
 <a class="jxr_linenumber" name="323" href="#323">323</a>   
-<a class="jxr_linenumber" name="324" href="#324">324</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
-<a class="jxr_linenumber" name="325" href="#325">325</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServerManager(<a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> p_serverManager)
+<a class="jxr_linenumber" name="324" href="#324">324</a>   <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
+<a class="jxr_linenumber" name="325" href="#325">325</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setCatalogJanitorEnabled(<strong class="jxr_keyword">boolean</strong> p_catalogJanitorEnabled)
 <a class="jxr_linenumber" name="326" href="#326">326</a>   {
-<a class="jxr_linenumber" name="327" href="#327">327</a>     (getImplData()).setServerManager(p_serverManager);
+<a class="jxr_linenumber" name="327" href="#327">327</a>     (getImplData()).setCatalogJanitorEnabled(p_catalogJanitorEnabled);
 <a class="jxr_linenumber" name="328" href="#328">328</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="329" href="#329">329</a>   }
 <a class="jxr_linenumber" name="330" href="#330">330</a>   
-<a class="jxr_linenumber" name="331" href="#331">331</a>   <strong class="jxr_keyword">protected</strong> List&lt;ServerName&gt; servers;
-<a class="jxr_linenumber" name="332" href="#332">332</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setServers(List&lt;ServerName&gt; p_servers)
+<a class="jxr_linenumber" name="331" href="#331">331</a>   <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
+<a class="jxr_linenumber" name="332" href="#332">332</a>   <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl setMetaLocation(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> p_metaLocation)
 <a class="jxr_linenumber" name="333" href="#333">333</a>   {
-<a class="jxr_linenumber" name="334" href="#334">334</a>     (getImplData()).setServers(p_servers);
+<a class="jxr_linenumber" name="334" href="#334">334</a>     (getImplData()).setMetaLocation(p_metaLocation);
 <a class="jxr_linenumber" name="335" href="#335">335</a>     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">this</strong>;
 <a class="jxr_linenumber" name="336" href="#336">336</a>   }
 <a class="jxr_linenumber" name="337" href="#337">337</a>   

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/29e33858/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
----------------------------------------------------------------------
diff --git a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
index 471a0c9..2508f7e 100644
--- a/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
+++ b/xref/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html
@@ -70,15 +70,15 @@
 <a class="jxr_linenumber" name="60" href="#60">60</a>  
 <a class="jxr_linenumber" name="61" href="#61">61</a>  {
 <a class="jxr_linenumber" name="62" href="#62">62</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/HMaster.html">HMaster</a> master;
-<a class="jxr_linenumber" name="63" href="#63">63</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set&lt;ServerName&gt; deadServers;
-<a class="jxr_linenumber" name="64" href="#64">64</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
-<a class="jxr_linenumber" name="65" href="#65">65</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
-<a class="jxr_linenumber" name="66" href="#66">66</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
-<a class="jxr_linenumber" name="67" href="#67">67</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String,Integer&gt; frags;
-<a class="jxr_linenumber" name="68" href="#68">68</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
-<a class="jxr_linenumber" name="69" href="#69">69</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
-<a class="jxr_linenumber" name="70" href="#70">70</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
-<a class="jxr_linenumber" name="71" href="#71">71</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List&lt;ServerName&gt; servers;
+<a class="jxr_linenumber" name="63" href="#63">63</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String filter;
+<a class="jxr_linenumber" name="64" href="#64">64</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> String format;
+<a class="jxr_linenumber" name="65" href="#65">65</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/AssignmentManager.html">AssignmentManager</a> assignmentManager;
+<a class="jxr_linenumber" name="66" href="#66">66</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> List&lt;ServerName&gt; servers;
+<a class="jxr_linenumber" name="67" href="#67">67</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Set&lt;ServerName&gt; deadServers;
+<a class="jxr_linenumber" name="68" href="#68">68</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String,Integer&gt; frags;
+<a class="jxr_linenumber" name="69" href="#69">69</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/ServerManager.html">ServerManager</a> serverManager;
+<a class="jxr_linenumber" name="70" href="#70">70</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> catalogJanitorEnabled;
+<a class="jxr_linenumber" name="71" href="#71">71</a>    <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html">ServerName</a> metaLocation;
 <a class="jxr_linenumber" name="72" href="#72">72</a>    <em class="jxr_comment">// 68, 1</em>
 <a class="jxr_linenumber" name="73" href="#73">73</a>    
 <a class="jxr_linenumber" name="74" href="#74">74</a>    <strong class="jxr_keyword">public</strong> String formatZKString() {
@@ -108,41 +108,41 @@
 <a class="jxr_linenumber" name="98" href="#98">98</a>  
 <a class="jxr_linenumber" name="99" href="#99">99</a>    <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData __jamon_setOptionalArguments(org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl.ImplData p_implData)
 <a class="jxr_linenumber" name="100" href="#100">100</a>   {
-<a class="jxr_linenumber" name="101" href="#101">101</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getDeadServers__IsNotDefault())
+<a class="jxr_linenumber" name="101" href="#101">101</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
 <a class="jxr_linenumber" name="102" href="#102">102</a>     {
-<a class="jxr_linenumber" name="103" href="#103">103</a>       p_implData.setDeadServers(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="103" href="#103">103</a>       p_implData.setFilter(<span class="jxr_string">"general"</span>);
 <a class="jxr_linenumber" name="104" href="#104">104</a>     }
-<a class="jxr_linenumber" name="105" href="#105">105</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getMetaLocation__IsNotDefault())
+<a class="jxr_linenumber" name="105" href="#105">105</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
 <a class="jxr_linenumber" name="106" href="#106">106</a>     {
-<a class="jxr_linenumber" name="107" href="#107">107</a>       p_implData.setMetaLocation(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="107" href="#107">107</a>       p_implData.setFormat(<span class="jxr_string">"html"</span>);
 <a class="jxr_linenumber" name="108" href="#108">108</a>     }
-<a class="jxr_linenumber" name="109" href="#109">109</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getFilter__IsNotDefault())
+<a class="jxr_linenumber" name="109" href="#109">109</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getAssignmentManager__IsNotDefault())
 <a class="jxr_linenumber" name="110" href="#110">110</a>     {
-<a class="jxr_linenumber" name="111" href="#111">111</a>       p_implData.setFilter(<span class="jxr_string">"general"</span>);
+<a class="jxr_linenumber" name="111" href="#111">111</a>       p_implData.setAssignmentManager(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="112" href="#112">112</a>     }
-<a class="jxr_linenumber" name="113" href="#113">113</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getCatalogJanitorEnabled__IsNotDefault())
+<a class="jxr_linenumber" name="113" href="#113">113</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getServers__IsNotDefault())
 <a class="jxr_linenumber" name="114" href="#114">114</a>     {
-<a class="jxr_linenumber" name="115" href="#115">115</a>       p_implData.setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="115" href="#115">115</a>       p_implData.setServers(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="116" href="#116">116</a>     }
-<a class="jxr_linenumber" name="117" href="#117">117</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getFrags__IsNotDefault())
+<a class="jxr_linenumber" name="117" href="#117">117</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getDeadServers__IsNotDefault())
 <a class="jxr_linenumber" name="118" href="#118">118</a>     {
-<a class="jxr_linenumber" name="119" href="#119">119</a>       p_implData.setFrags(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="119" href="#119">119</a>       p_implData.setDeadServers(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="120" href="#120">120</a>     }
-<a class="jxr_linenumber" name="121" href="#121">121</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getFormat__IsNotDefault())
+<a class="jxr_linenumber" name="121" href="#121">121</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getFrags__IsNotDefault())
 <a class="jxr_linenumber" name="122" href="#122">122</a>     {
-<a class="jxr_linenumber" name="123" href="#123">123</a>       p_implData.setFormat(<span class="jxr_string">"html"</span>);
+<a class="jxr_linenumber" name="123" href="#123">123</a>       p_implData.setFrags(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="124" href="#124">124</a>     }
-<a class="jxr_linenumber" name="125" href="#125">125</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getAssignmentManager__IsNotDefault())
+<a class="jxr_linenumber" name="125" href="#125">125</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getServerManager__IsNotDefault())
 <a class="jxr_linenumber" name="126" href="#126">126</a>     {
-<a class="jxr_linenumber" name="127" href="#127">127</a>       p_implData.setAssignmentManager(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="127" href="#127">127</a>       p_implData.setServerManager(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="128" href="#128">128</a>     }
-<a class="jxr_linenumber" name="129" href="#129">129</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getServerManager__IsNotDefault())
+<a class="jxr_linenumber" name="129" href="#129">129</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getCatalogJanitorEnabled__IsNotDefault())
 <a class="jxr_linenumber" name="130" href="#130">130</a>     {
-<a class="jxr_linenumber" name="131" href="#131">131</a>       p_implData.setServerManager(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="131" href="#131">131</a>       p_implData.setCatalogJanitorEnabled(<strong class="jxr_keyword">true</strong>);
 <a class="jxr_linenumber" name="132" href="#132">132</a>     }
-<a class="jxr_linenumber" name="133" href="#133">133</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getServers__IsNotDefault())
+<a class="jxr_linenumber" name="133" href="#133">133</a>     <strong class="jxr_keyword">if</strong>(! p_implData.getMetaLocation__IsNotDefault())
 <a class="jxr_linenumber" name="134" href="#134">134</a>     {
-<a class="jxr_linenumber" name="135" href="#135">135</a>       p_implData.setServers(<strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="135" href="#135">135</a>       p_implData.setMetaLocation(<strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="136" href="#136">136</a>     }
 <a class="jxr_linenumber" name="137" href="#137">137</a>     <strong class="jxr_keyword">return</strong> p_implData;
 <a class="jxr_linenumber" name="138" href="#138">138</a>   }
@@ -150,15 +150,15 @@
 <a class="jxr_linenumber" name="140" href="#140">140</a>   {
 <a class="jxr_linenumber" name="141" href="#141">141</a>     <strong class="jxr_keyword">super</strong>(p_templateManager, __jamon_setOptionalArguments(p_implData));
 <a class="jxr_linenumber" name="142" href="#142">142</a>     master = p_implData.getMaster();
-<a class="jxr_linenumber" name="143" href="#143">143</a>     deadServers = p_implData.getDeadServers();
-<a class="jxr_linenumber" name="144" href="#144">144</a>     metaLocation = p_implData.getMetaLocation();
-<a class="jxr_linenumber" name="145" href="#145">145</a>     filter = p_implData.getFilter();
-<a class="jxr_linenumber" name="146" href="#146">146</a>     catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();
-<a class="jxr_linenumber" name="147" href="#147">147</a>     frags = p_implData.getFrags();
-<a class="jxr_linenumber" name="148" href="#148">148</a>     format = p_implData.getFormat();
-<a class="jxr_linenumber" name="149" href="#149">149</a>     assignmentManager = p_implData.getAssignmentManager();
-<a class="jxr_linenumber" name="150" href="#150">150</a>     serverManager = p_implData.getServerManager();
-<a class="jxr_linenumber" name="151" href="#151">151</a>     servers = p_implData.getServers();
+<a class="jxr_linenumber" name="143" href="#143">143</a>     filter = p_implData.getFilter();
+<a class="jxr_linenumber" name="144" href="#144">144</a>     format = p_implData.getFormat();
+<a class="jxr_linenumber" name="145" href="#145">145</a>     assignmentManager = p_implData.getAssignmentManager();
+<a class="jxr_linenumber" name="146" href="#146">146</a>     servers = p_implData.getServers();
+<a class="jxr_linenumber" name="147" href="#147">147</a>     deadServers = p_implData.getDeadServers();
+<a class="jxr_linenumber" name="148" href="#148">148</a>     frags = p_implData.getFrags();
+<a class="jxr_linenumber" name="149" href="#149">149</a>     serverManager = p_implData.getServerManager();
+<a class="jxr_linenumber" name="150" href="#150">150</a>     catalogJanitorEnabled = p_implData.getCatalogJanitorEnabled();
+<a class="jxr_linenumber" name="151" href="#151">151</a>     metaLocation = p_implData.getMetaLocation();
 <a class="jxr_linenumber" name="152" href="#152">152</a>   }
 <a class="jxr_linenumber" name="153" href="#153">153</a>   
 <a class="jxr_linenumber" name="154" href="#154">154</a>   @Override <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> renderNoFlush(<strong class="jxr_keyword">final</strong> java.io.Writer jamonWriter)