hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r1711891 [35/50] - in /hbase/hbase.apache.org/trunk: ./ apidocs/ apidocs/org/apache/hadoop/hbase/ apidocs/org/apache/hadoop/hbase/class-use/ apidocs/org/apache/hadoop/hbase/client/ apidocs/org/apache/hadoop/hbase/client/class-use/ apidocs/o...
Date Mon, 02 Nov 2015 03:51:05 GMT
Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html Mon Nov  2 03:51:02 2015
@@ -3425,7 +3425,7 @@
 <span class="sourceLineNo">3417</span>              || hri.isMetaRegion())) {<a name="line.3417"></a>
 <span class="sourceLineNo">3418</span>            return true;<a name="line.3418"></a>
 <span class="sourceLineNo">3419</span>          }<a name="line.3419"></a>
-<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = HRegionInfo.getDaughterRegions(result);<a name="line.3420"></a>
+<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(result);<a name="line.3420"></a>
 <span class="sourceLineNo">3421</span>          for (HRegionLocation h : rl.getRegionLocations()) {<a name="line.3421"></a>
 <span class="sourceLineNo">3422</span>            if (h == null || h.getRegionInfo() == null) {<a name="line.3422"></a>
 <span class="sourceLineNo">3423</span>              continue;<a name="line.3423"></a>
@@ -3448,7 +3448,7 @@
 <span class="sourceLineNo">3440</span>              throw new IOException("Two entries in hbase:meta are same " + previous);<a name="line.3440"></a>
 <span class="sourceLineNo">3441</span>            }<a name="line.3441"></a>
 <span class="sourceLineNo">3442</span>          }<a name="line.3442"></a>
-<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = HRegionInfo.getMergeRegions(result);<a name="line.3443"></a>
+<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = MetaTableAccessor.getMergeRegions(result);<a name="line.3443"></a>
 <span class="sourceLineNo">3444</span>          for (HRegionInfo mergeRegion : new HRegionInfo[] {<a name="line.3444"></a>
 <span class="sourceLineNo">3445</span>              mergeRegions.getFirst(), mergeRegions.getSecond() }) {<a name="line.3445"></a>
 <span class="sourceLineNo">3446</span>            if (mergeRegion != null) {<a name="line.3446"></a>

Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.html Mon Nov  2 03:51:02 2015
@@ -3425,7 +3425,7 @@
 <span class="sourceLineNo">3417</span>              || hri.isMetaRegion())) {<a name="line.3417"></a>
 <span class="sourceLineNo">3418</span>            return true;<a name="line.3418"></a>
 <span class="sourceLineNo">3419</span>          }<a name="line.3419"></a>
-<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = HRegionInfo.getDaughterRegions(result);<a name="line.3420"></a>
+<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(result);<a name="line.3420"></a>
 <span class="sourceLineNo">3421</span>          for (HRegionLocation h : rl.getRegionLocations()) {<a name="line.3421"></a>
 <span class="sourceLineNo">3422</span>            if (h == null || h.getRegionInfo() == null) {<a name="line.3422"></a>
 <span class="sourceLineNo">3423</span>              continue;<a name="line.3423"></a>
@@ -3448,7 +3448,7 @@
 <span class="sourceLineNo">3440</span>              throw new IOException("Two entries in hbase:meta are same " + previous);<a name="line.3440"></a>
 <span class="sourceLineNo">3441</span>            }<a name="line.3441"></a>
 <span class="sourceLineNo">3442</span>          }<a name="line.3442"></a>
-<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = HRegionInfo.getMergeRegions(result);<a name="line.3443"></a>
+<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = MetaTableAccessor.getMergeRegions(result);<a name="line.3443"></a>
 <span class="sourceLineNo">3444</span>          for (HRegionInfo mergeRegion : new HRegionInfo[] {<a name="line.3444"></a>
 <span class="sourceLineNo">3445</span>              mergeRegions.getFirst(), mergeRegions.getSecond() }) {<a name="line.3445"></a>
 <span class="sourceLineNo">3446</span>            if (mergeRegion != null) {<a name="line.3446"></a>

Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.HbckInfo.html Mon Nov  2 03:51:02 2015
@@ -3425,7 +3425,7 @@
 <span class="sourceLineNo">3417</span>              || hri.isMetaRegion())) {<a name="line.3417"></a>
 <span class="sourceLineNo">3418</span>            return true;<a name="line.3418"></a>
 <span class="sourceLineNo">3419</span>          }<a name="line.3419"></a>
-<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = HRegionInfo.getDaughterRegions(result);<a name="line.3420"></a>
+<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(result);<a name="line.3420"></a>
 <span class="sourceLineNo">3421</span>          for (HRegionLocation h : rl.getRegionLocations()) {<a name="line.3421"></a>
 <span class="sourceLineNo">3422</span>            if (h == null || h.getRegionInfo() == null) {<a name="line.3422"></a>
 <span class="sourceLineNo">3423</span>              continue;<a name="line.3423"></a>
@@ -3448,7 +3448,7 @@
 <span class="sourceLineNo">3440</span>              throw new IOException("Two entries in hbase:meta are same " + previous);<a name="line.3440"></a>
 <span class="sourceLineNo">3441</span>            }<a name="line.3441"></a>
 <span class="sourceLineNo">3442</span>          }<a name="line.3442"></a>
-<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = HRegionInfo.getMergeRegions(result);<a name="line.3443"></a>
+<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = MetaTableAccessor.getMergeRegions(result);<a name="line.3443"></a>
 <span class="sourceLineNo">3444</span>          for (HRegionInfo mergeRegion : new HRegionInfo[] {<a name="line.3444"></a>
 <span class="sourceLineNo">3445</span>              mergeRegions.getFirst(), mergeRegions.getSecond() }) {<a name="line.3445"></a>
 <span class="sourceLineNo">3446</span>            if (mergeRegion != null) {<a name="line.3446"></a>

Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.RegionRepairException.html Mon Nov  2 03:51:02 2015
@@ -3425,7 +3425,7 @@
 <span class="sourceLineNo">3417</span>              || hri.isMetaRegion())) {<a name="line.3417"></a>
 <span class="sourceLineNo">3418</span>            return true;<a name="line.3418"></a>
 <span class="sourceLineNo">3419</span>          }<a name="line.3419"></a>
-<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = HRegionInfo.getDaughterRegions(result);<a name="line.3420"></a>
+<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(result);<a name="line.3420"></a>
 <span class="sourceLineNo">3421</span>          for (HRegionLocation h : rl.getRegionLocations()) {<a name="line.3421"></a>
 <span class="sourceLineNo">3422</span>            if (h == null || h.getRegionInfo() == null) {<a name="line.3422"></a>
 <span class="sourceLineNo">3423</span>              continue;<a name="line.3423"></a>
@@ -3448,7 +3448,7 @@
 <span class="sourceLineNo">3440</span>              throw new IOException("Two entries in hbase:meta are same " + previous);<a name="line.3440"></a>
 <span class="sourceLineNo">3441</span>            }<a name="line.3441"></a>
 <span class="sourceLineNo">3442</span>          }<a name="line.3442"></a>
-<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = HRegionInfo.getMergeRegions(result);<a name="line.3443"></a>
+<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = MetaTableAccessor.getMergeRegions(result);<a name="line.3443"></a>
 <span class="sourceLineNo">3444</span>          for (HRegionInfo mergeRegion : new HRegionInfo[] {<a name="line.3444"></a>
 <span class="sourceLineNo">3445</span>              mergeRegions.getFirst(), mergeRegions.getSecond() }) {<a name="line.3445"></a>
 <span class="sourceLineNo">3446</span>            if (mergeRegion != null) {<a name="line.3446"></a>

Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.TableInfo.html Mon Nov  2 03:51:02 2015
@@ -3425,7 +3425,7 @@
 <span class="sourceLineNo">3417</span>              || hri.isMetaRegion())) {<a name="line.3417"></a>
 <span class="sourceLineNo">3418</span>            return true;<a name="line.3418"></a>
 <span class="sourceLineNo">3419</span>          }<a name="line.3419"></a>
-<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = HRegionInfo.getDaughterRegions(result);<a name="line.3420"></a>
+<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(result);<a name="line.3420"></a>
 <span class="sourceLineNo">3421</span>          for (HRegionLocation h : rl.getRegionLocations()) {<a name="line.3421"></a>
 <span class="sourceLineNo">3422</span>            if (h == null || h.getRegionInfo() == null) {<a name="line.3422"></a>
 <span class="sourceLineNo">3423</span>              continue;<a name="line.3423"></a>
@@ -3448,7 +3448,7 @@
 <span class="sourceLineNo">3440</span>              throw new IOException("Two entries in hbase:meta are same " + previous);<a name="line.3440"></a>
 <span class="sourceLineNo">3441</span>            }<a name="line.3441"></a>
 <span class="sourceLineNo">3442</span>          }<a name="line.3442"></a>
-<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = HRegionInfo.getMergeRegions(result);<a name="line.3443"></a>
+<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = MetaTableAccessor.getMergeRegions(result);<a name="line.3443"></a>
 <span class="sourceLineNo">3444</span>          for (HRegionInfo mergeRegion : new HRegionInfo[] {<a name="line.3444"></a>
 <span class="sourceLineNo">3445</span>              mergeRegions.getFirst(), mergeRegions.getSecond() }) {<a name="line.3445"></a>
 <span class="sourceLineNo">3446</span>            if (mergeRegion != null) {<a name="line.3446"></a>

Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/HBaseFsck.html Mon Nov  2 03:51:02 2015
@@ -3425,7 +3425,7 @@
 <span class="sourceLineNo">3417</span>              || hri.isMetaRegion())) {<a name="line.3417"></a>
 <span class="sourceLineNo">3418</span>            return true;<a name="line.3418"></a>
 <span class="sourceLineNo">3419</span>          }<a name="line.3419"></a>
-<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = HRegionInfo.getDaughterRegions(result);<a name="line.3420"></a>
+<span class="sourceLineNo">3420</span>          PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(result);<a name="line.3420"></a>
 <span class="sourceLineNo">3421</span>          for (HRegionLocation h : rl.getRegionLocations()) {<a name="line.3421"></a>
 <span class="sourceLineNo">3422</span>            if (h == null || h.getRegionInfo() == null) {<a name="line.3422"></a>
 <span class="sourceLineNo">3423</span>              continue;<a name="line.3423"></a>
@@ -3448,7 +3448,7 @@
 <span class="sourceLineNo">3440</span>              throw new IOException("Two entries in hbase:meta are same " + previous);<a name="line.3440"></a>
 <span class="sourceLineNo">3441</span>            }<a name="line.3441"></a>
 <span class="sourceLineNo">3442</span>          }<a name="line.3442"></a>
-<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = HRegionInfo.getMergeRegions(result);<a name="line.3443"></a>
+<span class="sourceLineNo">3443</span>          PairOfSameType&lt;HRegionInfo&gt; mergeRegions = MetaTableAccessor.getMergeRegions(result);<a name="line.3443"></a>
 <span class="sourceLineNo">3444</span>          for (HRegionInfo mergeRegion : new HRegionInfo[] {<a name="line.3444"></a>
 <span class="sourceLineNo">3445</span>              mergeRegions.getFirst(), mergeRegions.getSecond() }) {<a name="line.3445"></a>
 <span class="sourceLineNo">3446</span>            if (mergeRegion != null) {<a name="line.3446"></a>

Modified: hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/Merge.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/Merge.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/Merge.html (original)
+++ hbase/hbase.apache.org/trunk/devapidocs/src-html/org/apache/hadoop/hbase/util/Merge.html Mon Nov  2 03:51:02 2015
@@ -31,248 +31,249 @@
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import org.apache.commons.logging.Log;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.commons.logging.LogFactory;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configured;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.FileSystem;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.Path;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableDescriptor;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HConstants;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.MasterNotRunningException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Get;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.HBaseAdmin;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Result;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.io.WritableComparator;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.util.Tool;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.util.ToolRunner;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>import com.google.common.base.Preconditions;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * Utility that can merge any two regions in the same table: adjacent,<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * overlapping or disjoint.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.54"></a>
-<span class="sourceLineNo">055</span>public class Merge extends Configured implements Tool {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  private static final Log LOG = LogFactory.getLog(Merge.class);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private Path rootdir;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private volatile MetaUtils utils;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private TableName tableName;               // Name of table<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private volatile byte [] region1;        // Name of region 1<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  private volatile byte [] region2;        // Name of region 2<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private volatile HRegionInfo mergeInfo = null;<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @Override<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public int run(String[] args) throws Exception {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    if (parseArgs(args) != 0) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      return -1;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>    // Verify file system is up.<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    FileSystem fs = FileSystem.get(getConf());              // get DFS handle<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    LOG.info("Verifying that file system is available...");<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    try {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      FSUtils.checkFileSystemAvailable(fs);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    } catch (IOException e) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      LOG.fatal("File system is not available", e);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      return -1;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>    // Verify HBase is down<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    LOG.info("Verifying that HBase is not running...");<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    try {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      HBaseAdmin.checkHBaseAvailable(getConf());<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      LOG.fatal("HBase cluster must be off-line, and is not. Aborting.");<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      return -1;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    } catch (ZooKeeperConnectionException zkce) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      // If no zk, presume no master.<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    } catch (MasterNotRunningException e) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      // Expected. Ignore.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>    // Initialize MetaUtils and and get the root of the HBase installation<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>    this.utils = new MetaUtils(getConf());<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    this.rootdir = FSUtils.getRootDir(getConf());<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    try {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      mergeTwoRegions();<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      return 0;<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    } catch (IOException e) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      LOG.fatal("Merge failed", e);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      return -1;<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    } finally {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      if (this.utils != null) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        this.utils.shutdown();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      }<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  /** @return HRegionInfo for merge result */<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  HRegionInfo getMergedHRegionInfo() {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    return this.mergeInfo;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  /*<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * Merges two regions from a user table.<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  private void mergeTwoRegions() throws IOException {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    LOG.info("Merging regions " + Bytes.toStringBinary(this.region1) + " and " +<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        Bytes.toStringBinary(this.region2) + " in table " + this.tableName);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    HRegion meta = this.utils.getMetaRegion();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    Get get = new Get(region1);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    get.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    Result result1 =  meta.get(get);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    Preconditions.checkState(!result1.isEmpty(),<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        "First region cells can not be null");<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    HRegionInfo info1 = HRegionInfo.getHRegionInfo(result1);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    if (info1 == null) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      throw new NullPointerException("info1 is null using key " +<a name="line.129"></a>
-<span class="sourceLineNo">130</span>          Bytes.toStringBinary(region1) + " in " + meta);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    get = new Get(region2);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    get.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    Result result2 =  meta.get(get);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    Preconditions.checkState(!result2.isEmpty(),<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        "Second region cells can not be null");<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    HRegionInfo info2 = HRegionInfo.getHRegionInfo(result2);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    if (info2 == null) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      throw new NullPointerException("info2 is null using key " + meta);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    TableDescriptor htd = FSTableDescriptors.getTableDescriptorFromFs(FileSystem.get(getConf()),<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      this.rootdir, this.tableName);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    HRegion merged = merge(htd.getHTableDescriptor(), meta, info1, info2);<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    LOG.info("Adding " + merged.getRegionInfo() + " to " +<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        meta.getRegionInfo());<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span>    HRegion.addRegionToMETA(meta, merged);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    merged.close();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  /*<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * Actually merge two regions and update their info in the meta region(s)<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * Returns HRegion object for newly merged region<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  private HRegion merge(final HTableDescriptor htd, HRegion meta,<a name="line.156"></a>
-<span class="sourceLineNo">157</span>                        HRegionInfo info1, HRegionInfo info2)<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  throws IOException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    if (info1 == null) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      throw new IOException("Could not find " + Bytes.toStringBinary(region1) + " in " +<a name="line.160"></a>
-<span class="sourceLineNo">161</span>          Bytes.toStringBinary(meta.getRegionInfo().getRegionName()));<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    if (info2 == null) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      throw new IOException("Could not find " + Bytes.toStringBinary(region2) + " in " +<a name="line.164"></a>
-<span class="sourceLineNo">165</span>          Bytes.toStringBinary(meta.getRegionInfo().getRegionName()));<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    HRegion merged = null;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    HRegion r1 = HRegion.openHRegion(info1, htd, utils.getLog(info1), getConf());<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      HRegion r2 = HRegion.openHRegion(info2, htd, utils.getLog(info2), getConf());<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      try {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        merged = HRegion.merge(r1, r2);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      } finally {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        if (!r2.isClosed()) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          r2.close();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    } finally {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      if (!r1.isClosed()) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        r1.close();<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>    // Remove the old regions from meta.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    // HRegion.merge has already deleted their files<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    removeRegionFromMeta(meta, info1);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    removeRegionFromMeta(meta, info2);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span>    this.mergeInfo = merged.getRegionInfo();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    return merged;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  /*<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   * Removes a region's meta information from the passed &lt;code&gt;meta&lt;/code&gt;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   * region.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   *<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   * @param meta hbase:meta HRegion to be updated<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * @param regioninfo HRegionInfo of region to remove from &lt;code&gt;meta&lt;/code&gt;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   *<a name="line.200"></a>
-<span class="sourceLineNo">201</span>   * @throws IOException<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   */<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  private void removeRegionFromMeta(HRegion meta, HRegionInfo regioninfo)<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  throws IOException {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    if (LOG.isDebugEnabled()) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      LOG.debug("Removing region: " + regioninfo + " from " + meta);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>    Delete delete  = new Delete(regioninfo.getRegionName(),<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        System.currentTimeMillis());<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    meta.delete(delete);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>  /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * Parse given arguments and assign table name and regions names.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   * (generic args are handled by ToolRunner.)<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   *<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   * @param args the arguments to parse<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   *<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * @throws IOException<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  private int parseArgs(String[] args) throws IOException {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    if (args.length != 3) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      usage();<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      return -1;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    tableName = TableName.valueOf(args[0]);<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>    region1 = Bytes.toBytesBinary(args[1]);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    region2 = Bytes.toBytesBinary(args[2]);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    int status = 0;<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    if (notInTable(tableName, region1) || notInTable(tableName, region2)) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      status = -1;<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    } else if (Bytes.equals(region1, region2)) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      LOG.error("Can't merge a region with itself");<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      status = -1;<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    return status;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>  private boolean notInTable(final TableName tn, final byte [] rn) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    if (WritableComparator.compareBytes(tn.getName(), 0, tn.getName().length,<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        rn, 0, tn.getName().length) != 0) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      LOG.error("Region " + Bytes.toStringBinary(rn) + " does not belong to table " +<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        tn);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      return true;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    return false;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>  }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>  private void usage() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    System.err<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        .println("For hadoop 0.21+, Usage: bin/hbase org.apache.hadoop.hbase.util.Merge "<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            + "[-Dfs.defaultFS=hdfs://nn:port] &lt;table-name&gt; &lt;region-1&gt; &lt;region-2&gt;\n");<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>  public static void main(String[] args) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    int status;<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    try {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      status = ToolRunner.run(HBaseConfiguration.create(), new Merge(), args);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    } catch (Exception e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      LOG.error("exiting due to error", e);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      status = -1;<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    System.exit(status);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>}<a name="line.267"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.conf.Configured;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.FileSystem;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.fs.Path;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.TableDescriptor;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.TableName;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.MasterNotRunningException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Get;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.HBaseAdmin;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Result;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.util.Tool;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.util.ToolRunner;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>import com.google.common.base.Preconditions;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>/**<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * Utility that can merge any two regions in the same table: adjacent,<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * overlapping or disjoint.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.55"></a>
+<span class="sourceLineNo">056</span>public class Merge extends Configured implements Tool {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  private static final Log LOG = LogFactory.getLog(Merge.class);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private Path rootdir;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  private volatile MetaUtils utils;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private TableName tableName;               // Name of table<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private volatile byte [] region1;        // Name of region 1<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  private volatile byte [] region2;        // Name of region 2<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  private volatile HRegionInfo mergeInfo = null;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public int run(String[] args) throws Exception {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    if (parseArgs(args) != 0) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      return -1;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // Verify file system is up.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    FileSystem fs = FileSystem.get(getConf());              // get DFS handle<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    LOG.info("Verifying that file system is available...");<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    try {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      FSUtils.checkFileSystemAvailable(fs);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    } catch (IOException e) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      LOG.fatal("File system is not available", e);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      return -1;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>    // Verify HBase is down<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    LOG.info("Verifying that HBase is not running...");<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      HBaseAdmin.checkHBaseAvailable(getConf());<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      LOG.fatal("HBase cluster must be off-line, and is not. Aborting.");<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      return -1;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    } catch (ZooKeeperConnectionException zkce) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      // If no zk, presume no master.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    } catch (MasterNotRunningException e) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      // Expected. Ignore.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>    // Initialize MetaUtils and and get the root of the HBase installation<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>    this.utils = new MetaUtils(getConf());<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    this.rootdir = FSUtils.getRootDir(getConf());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      mergeTwoRegions();<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      return 0;<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    } catch (IOException e) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      LOG.fatal("Merge failed", e);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      return -1;<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>    } finally {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      if (this.utils != null) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        this.utils.shutdown();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  /** @return HRegionInfo for merge result */<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  HRegionInfo getMergedHRegionInfo() {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    return this.mergeInfo;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  /*<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * Merges two regions from a user table.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   */<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  private void mergeTwoRegions() throws IOException {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    LOG.info("Merging regions " + Bytes.toStringBinary(this.region1) + " and " +<a name="line.120"></a>
+<span class="sourceLineNo">121</span>        Bytes.toStringBinary(this.region2) + " in table " + this.tableName);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    HRegion meta = this.utils.getMetaRegion();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    Get get = new Get(region1);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    get.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    Result result1 =  meta.get(get);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    Preconditions.checkState(!result1.isEmpty(),<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        "First region cells can not be null");<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    HRegionInfo info1 = MetaTableAccessor.getHRegionInfo(result1);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    if (info1 == null) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      throw new NullPointerException("info1 is null using key " +<a name="line.130"></a>
+<span class="sourceLineNo">131</span>          Bytes.toStringBinary(region1) + " in " + meta);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    get = new Get(region2);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    get.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    Result result2 =  meta.get(get);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    Preconditions.checkState(!result2.isEmpty(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        "Second region cells can not be null");<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    HRegionInfo info2 = MetaTableAccessor.getHRegionInfo(result2);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    if (info2 == null) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      throw new NullPointerException("info2 is null using key " + meta);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    TableDescriptor htd = FSTableDescriptors.getTableDescriptorFromFs(FileSystem.get(getConf()),<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      this.rootdir, this.tableName);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    HRegion merged = merge(htd.getHTableDescriptor(), meta, info1, info2);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    LOG.info("Adding " + merged.getRegionInfo() + " to " +<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        meta.getRegionInfo());<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    HRegion.addRegionToMETA(meta, merged);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    merged.close();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>  /*<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   * Actually merge two regions and update their info in the meta region(s)<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * Returns HRegion object for newly merged region<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  private HRegion merge(final HTableDescriptor htd, HRegion meta,<a name="line.157"></a>
+<span class="sourceLineNo">158</span>                        HRegionInfo info1, HRegionInfo info2)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  throws IOException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    if (info1 == null) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      throw new IOException("Could not find " + Bytes.toStringBinary(region1) + " in " +<a name="line.161"></a>
+<span class="sourceLineNo">162</span>          Bytes.toStringBinary(meta.getRegionInfo().getRegionName()));<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    if (info2 == null) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      throw new IOException("Could not find " + Bytes.toStringBinary(region2) + " in " +<a name="line.165"></a>
+<span class="sourceLineNo">166</span>          Bytes.toStringBinary(meta.getRegionInfo().getRegionName()));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    HRegion merged = null;<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    HRegion r1 = HRegion.openHRegion(info1, htd, utils.getLog(info1), getConf());<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    try {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      HRegion r2 = HRegion.openHRegion(info2, htd, utils.getLog(info2), getConf());<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      try {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        merged = HRegion.merge(r1, r2);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      } finally {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        if (!r2.isClosed()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>          r2.close();<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>
+<span class="sourceLineNo">179</span>    } finally {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      if (!r1.isClosed()) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        r1.close();<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>    // Remove the old regions from meta.<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    // HRegion.merge has already deleted their files<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    removeRegionFromMeta(meta, info1);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    removeRegionFromMeta(meta, info2);<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>    this.mergeInfo = merged.getRegionInfo();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    return merged;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>  /*<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * Removes a region's meta information from the passed &lt;code&gt;meta&lt;/code&gt;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   * region.<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   *<a name="line.198"></a>
+<span class="sourceLineNo">199</span>   * @param meta hbase:meta HRegion to be updated<a name="line.199"></a>
+<span class="sourceLineNo">200</span>   * @param regioninfo HRegionInfo of region to remove from &lt;code&gt;meta&lt;/code&gt;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   *<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * @throws IOException<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   */<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  private void removeRegionFromMeta(HRegion meta, HRegionInfo regioninfo)<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  throws IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    if (LOG.isDebugEnabled()) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      LOG.debug("Removing region: " + regioninfo + " from " + meta);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>    Delete delete  = new Delete(regioninfo.getRegionName(),<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        System.currentTimeMillis());<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    meta.delete(delete);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>  /**<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   * Parse given arguments and assign table name and regions names.<a name="line.216"></a>
+<span class="sourceLineNo">217</span>   * (generic args are handled by ToolRunner.)<a name="line.217"></a>
+<span class="sourceLineNo">218</span>   *<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   * @param args the arguments to parse<a name="line.219"></a>
+<span class="sourceLineNo">220</span>   *<a name="line.220"></a>
+<span class="sourceLineNo">221</span>   * @throws IOException<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   */<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  private int parseArgs(String[] args) throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    if (args.length != 3) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      usage();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      return -1;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    }<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    tableName = TableName.valueOf(args[0]);<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    region1 = Bytes.toBytesBinary(args[1]);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    region2 = Bytes.toBytesBinary(args[2]);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    int status = 0;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    if (notInTable(tableName, region1) || notInTable(tableName, region2)) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      status = -1;<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    } else if (Bytes.equals(region1, region2)) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      LOG.error("Can't merge a region with itself");<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      status = -1;<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    return status;<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  }<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>  private boolean notInTable(final TableName tn, final byte [] rn) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    if (WritableComparator.compareBytes(tn.getName(), 0, tn.getName().length,<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        rn, 0, tn.getName().length) != 0) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      LOG.error("Region " + Bytes.toStringBinary(rn) + " does not belong to table " +<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        tn);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      return true;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    return false;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>  }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>  private void usage() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    System.err<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        .println("For hadoop 0.21+, Usage: bin/hbase org.apache.hadoop.hbase.util.Merge "<a name="line.254"></a>
+<span class="sourceLineNo">255</span>            + "[-Dfs.defaultFS=hdfs://nn:port] &lt;table-name&gt; &lt;region-1&gt; &lt;region-2&gt;\n");<a name="line.255"></a>
+<span class="sourceLineNo">256</span>  }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span>  public static void main(String[] args) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    int status;<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    try {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      status = ToolRunner.run(HBaseConfiguration.create(), new Merge(), args);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    } catch (Exception e) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      LOG.error("exiting due to error", e);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      status = -1;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    System.exit(status);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>}<a name="line.268"></a>
 
 
 

Modified: hbase/hbase.apache.org/trunk/distribution-management.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/distribution-management.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/distribution-management.html (original)
+++ hbase/hbase.apache.org/trunk/distribution-management.html Mon Nov  2 03:51:02 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-11-01
+ Generated by Apache Maven Doxia at 2015-11-02
  Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -148,7 +148,7 @@
 			<ul class="breadcrumb">
 				<li class="projectVersion version-date">Version: 2.0.0-SNAPSHOT</li>
 				<li class="divider">|</li>
-				<li class="publishDate version-date">Last Published: 2015-11-01</li>
+				<li class="publishDate version-date">Last Published: 2015-11-02</li>
 			</ul>
 		</div>
 	</header>

Modified: hbase/hbase.apache.org/trunk/export_control.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/export_control.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/export_control.html (original)
+++ hbase/hbase.apache.org/trunk/export_control.html Mon Nov  2 03:51:02 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-11-01
+ Generated by Apache Maven Doxia at 2015-11-02
  Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -150,7 +150,7 @@
 			<ul class="breadcrumb">
 				<li class="projectVersion version-date">Version: 2.0.0-SNAPSHOT</li>
 				<li class="divider">|</li>
-				<li class="publishDate version-date">Last Published: 2015-11-01</li>
+				<li class="publishDate version-date">Last Published: 2015-11-02</li>
 			</ul>
 		</div>
 	</header>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/checkstyle.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/checkstyle.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/checkstyle.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/checkstyle.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/dependencies.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/dependencies.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/dependencies.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/dependencies.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/dependency-convergence.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/dependency-convergence.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/dependency-convergence.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/dependency-convergence.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/dependency-info.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/dependency-info.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/dependency-info.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/dependency-info.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/dependency-management.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/dependency-management.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/dependency-management.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/dependency-management.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/distribution-management.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/distribution-management.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/distribution-management.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/distribution-management.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/index.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/index.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/index.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/index.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/integration.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/integration.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/integration.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/integration.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/issue-tracking.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/issue-tracking.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/issue-tracking.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/issue-tracking.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/license.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/license.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/license.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/license.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/mail-lists.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/mail-lists.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/mail-lists.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/mail-lists.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/plugin-management.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/plugin-management.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/plugin-management.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/plugin-management.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/plugins.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/plugins.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/plugins.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/plugins.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>

Modified: hbase/hbase.apache.org/trunk/hbase-annotations/project-info.html
URL: http://svn.apache.org/viewvc/hbase/hbase.apache.org/trunk/hbase-annotations/project-info.html?rev=1711891&r1=1711890&r2=1711891&view=diff
==============================================================================
--- hbase/hbase.apache.org/trunk/hbase-annotations/project-info.html (original)
+++ hbase/hbase.apache.org/trunk/hbase-annotations/project-info.html Mon Nov  2 03:51:02 2015
@@ -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 2015-11-01 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.6 at 2015-11-02 -->
 <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="20151101" />
+    <meta name="Date-Revision-yyyymmdd" content="20151102" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -27,7 +27,7 @@
             
                     
                 <div class="xleft">
-        <span id="publishDate">Last Published: 2015-11-01</span>
+        <span id="publishDate">Last Published: 2015-11-02</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>




Mime
View raw message