[04/43] hbase git commit: HBASE-15000 Fix javadoc warn in LoadIncrementalHFiles. (Ashish)

2015-12-26 Thread syuanjiang 
HBASE-15000 Fix javadoc warn in LoadIncrementalHFiles. (Ashish)


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

Branch: refs/heads/hbase-12439
Commit: 80fc18d2e1f72d312a4ab90a32d6e44c9b560493
Parents: cf458d3
Author: anoopsjohn 
Authored: Thu Dec 17 22:47:48 2015 +0530
Committer: anoopsjohn 
Committed: Thu Dec 17 22:47:48 2015 +0530

--
 .../apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/80fc18d2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 5064c05..0e35427 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -425,11 +425,12 @@ public class LoadIncrementalHFiles extends Configured 
implements Tool {
* @param hfilesDir directory containing list of hfiles to be loaded into 
the table
* @param table table to which hfiles should be loaded
* @param queue queue which needs to be loaded into the table
+   * @param validateHFile if true hfiles will be validated for its format
* @throws IOException If any I/O or network error occurred
*/
-  public void prepareHFileQueue(Path hfofDir, Table table, 
Deque queue,
+  public void prepareHFileQueue(Path hfilesDir, Table table, 
Deque queue,
   boolean validateHFile) throws IOException {
-discoverLoadQueue(queue, hfofDir, validateHFile);
+discoverLoadQueue(queue, hfilesDir, validateHFile);
 validateFamiliesInHFiles(table, queue);
   }

hbase git commit: HBASE-15000 Fix javadoc warn in LoadIncrementalHFiles. (Ashish)

2015-12-17 Thread anoopsamjohn 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 6ec92281e -> 3919f38e0


HBASE-15000 Fix javadoc warn in LoadIncrementalHFiles. (Ashish)


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

Branch: refs/heads/branch-1
Commit: 3919f38e0d9b702d35535a20801f91bb78627412
Parents: 6ec9228
Author: anoopsjohn 
Authored: Thu Dec 17 22:49:49 2015 +0530
Committer: anoopsjohn 
Committed: Thu Dec 17 22:49:49 2015 +0530

--
 .../apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3919f38e/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index a2b8b92..9ac71b9 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -452,11 +452,12 @@ public class LoadIncrementalHFiles extends Configured 
implements Tool {
* @param hfilesDir directory containing list of hfiles to be loaded into 
the table
* @param table table to which hfiles should be loaded
* @param queue queue which needs to be loaded into the table
+   * @param validateHFile if true hfiles will be validated for its format
* @throws IOException If any I/O or network error occurred
*/
-  public void prepareHFileQueue(Path hfofDir, Table table, 
Deque queue,
+  public void prepareHFileQueue(Path hfilesDir, Table table, 
Deque queue,
   boolean validateHFile) throws IOException {
-discoverLoadQueue(queue, hfofDir, validateHFile);
+discoverLoadQueue(queue, hfilesDir, validateHFile);
 validateFamiliesInHFiles(table, queue);
   }

hbase git commit: HBASE-15000 Fix javadoc warn in LoadIncrementalHFiles. (Ashish)

2015-12-17 Thread anoopsamjohn 
Repository: hbase
Updated Branches:
  refs/heads/master cf458d302 -> 80fc18d2e


HBASE-15000 Fix javadoc warn in LoadIncrementalHFiles. (Ashish)


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

Branch: refs/heads/master
Commit: 80fc18d2e1f72d312a4ab90a32d6e44c9b560493
Parents: cf458d3
Author: anoopsjohn 
Authored: Thu Dec 17 22:47:48 2015 +0530
Committer: anoopsjohn 
Committed: Thu Dec 17 22:47:48 2015 +0530

--
 .../apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/80fc18d2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 5064c05..0e35427 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -425,11 +425,12 @@ public class LoadIncrementalHFiles extends Configured 
implements Tool {
* @param hfilesDir directory containing list of hfiles to be loaded into 
the table
* @param table table to which hfiles should be loaded
* @param queue queue which needs to be loaded into the table
+   * @param validateHFile if true hfiles will be validated for its format
* @throws IOException If any I/O or network error occurred
*/
-  public void prepareHFileQueue(Path hfofDir, Table table, 
Deque queue,
+  public void prepareHFileQueue(Path hfilesDir, Table table, 
Deque queue,
   boolean validateHFile) throws IOException {
-discoverLoadQueue(queue, hfofDir, validateHFile);
+discoverLoadQueue(queue, hfilesDir, validateHFile);
 validateFamiliesInHFiles(table, queue);
   }