From 9dd54956db23c3431906178387fb8899c1ed7bd0 Mon Sep 17 00:00:00 2001
From: Misty Stanley-Jones
Date: Wed, 10 Feb 2016 11:46:22 -0800
Subject: [PATCH 1/2] HBASE-15250 Fix old URLs that currently get redirected
---
src/main/asciidoc/_chapters/ops_mgt.adoc | 2 +-
src/main/site/site.xml | 2 +-
src/main/site/xdoc/index.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc b/src/main/asciidoc/_chapters/ops_mgt.adoc
index 0f93785..7e0e23d 100644
--- a/src/main/asciidoc/_chapters/ops_mgt.adoc
+++ b/src/main/asciidoc/_chapters/ops_mgt.adoc
@@ -1867,7 +1867,7 @@ The act of copying these files creates new HDFS metadata, which is why a restore
=== Live Cluster Backup - Replication
This approach assumes that there is a second cluster.
-See the HBase page on link:http://hbase.apache.org/replication.html[replication] for more information.
+See the HBase page on link:http://hbase.apache.org/book.html#replication[replication] for more information.
[[ops.backup.live.copytable]]
=== Live Cluster Backup - CopyTable
diff --git a/src/main/site/site.xml b/src/main/site/site.xml
index 02b28ca..6d4de53 100644
--- a/src/main/site/site.xml
+++ b/src/main/site/site.xml
@@ -111,7 +111,7 @@
-
+
-
diff --git a/src/main/site/xdoc/index.xml b/src/main/site/xdoc/index.xml
index 134e58f..50d18c3 100644
--- a/src/main/site/xdoc/index.xml
+++ b/src/main/site/xdoc/index.xml
@@ -69,7 +69,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
- See the Architecture Overview, the Apache HBase Reference Guide FAQ,
+
See the Architecture Overview, the Apache HBase Reference Guide FAQ,
and the other documentation links.
--
2.5.4 (Apple Git-61)
From e9889d1218ed69269d1be31ed7928e5b6db9f4c5 Mon Sep 17 00:00:00 2001
From: Misty Stanley-Jones
Date: Thu, 18 Feb 2016 13:29:09 -0800
Subject: [PATCH 2/2] HBASE-15289 Add details about how to get usage
instructions for Import and Export tools
---
src/main/asciidoc/_chapters/ops_mgt.adoc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc b/src/main/asciidoc/_chapters/ops_mgt.adoc
index 7e0e23d..66d7545 100644
--- a/src/main/asciidoc/_chapters/ops_mgt.adoc
+++ b/src/main/asciidoc/_chapters/ops_mgt.adoc
@@ -434,6 +434,9 @@ Invoke via:
$ bin/hbase org.apache.hadoop.hbase.mapreduce.Export [ [ []]]
----
+NOTE: To see usage instructions, run the command with no options. Available options include
+specifying column families and applying filters during the export.
+
By default, the `Export` tool only exports the newest version of a given cell, regardless of the number of versions stored. To export more than one version, replace *__* with the desired number of versions.
Note: caching for the input Scan is configured via `hbase.client.scanner.caching` in the job configuration.
@@ -447,6 +450,8 @@ Invoke via:
$ bin/hbase org.apache.hadoop.hbase.mapreduce.Import
----
+NOTE: To see usage instructions, run the command with no options.
+
To import 0.94 exported files in a 0.96 cluster or onwards, you need to set system property "hbase.import.version" when running the import command as below:
----
--
2.5.4 (Apple Git-61)