hadoop git commit: HADOOP-13034. Log message about input options in distcp lacks some items (Takashi Ohnishi via aw)

2016-10-17 Thread yjzhangal
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 e02c756f1 -> a5a56c356


HADOOP-13034. Log message about input options in distcp lacks some items 
(Takashi Ohnishi via aw)

(cherry picked from commit 422c73a8657d8699920f7db13d4be200e16c4272)


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

Branch: refs/heads/branch-2
Commit: a5a56c3564d486f8df258e64ad5c243395def12a
Parents: e02c756
Author: Allen Wittenauer 
Authored: Tue Jun 28 07:21:04 2016 -0700
Committer: Yongjun Zhang 
Committed: Mon Oct 17 16:35:32 2016 -0700

--
 .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java | 4 
 .../src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java | 1 +
 .../src/test/java/org/apache/hadoop/tools/TestOptionsParser.java | 1 +
 3 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5a56c35/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
index b81bc03..a3af917 100644
--- 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
+++ 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
@@ -680,6 +680,10 @@ public class DistCpOptions {
 ", deleteMissing=" + deleteMissing +
 ", ignoreFailures=" + ignoreFailures +
 ", overwrite=" + overwrite +
+", append=" + append +
+", useDiff=" + useDiff +
+", fromSnapshot=" + fromSnapshot +
+", toSnapshot=" + toSnapshot +
 ", skipCRC=" + skipCRC +
 ", blocking=" + blocking +
 ", numListstatusThreads=" + numListstatusThreads +

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5a56c35/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
 
b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
index 5a56cc3..7f15a60 100644
--- 
a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
+++ 
b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
@@ -305,6 +305,7 @@ public class TestDistCpOptions {
 DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz"));
 final String val = "DistCpOptions{atomicCommit=false, syncFolder=false, "
 + "deleteMissing=false, ignoreFailures=false, overwrite=false, "
++ "append=false, useDiff=false, fromSnapshot=null, toSnapshot=null, "
 + "skipCRC=false, blocking=true, numListstatusThreads=0, maxMaps=20, "
 + "mapBandwidth=100, sslConfigurationFile='null', "
 + "copyStrategy='uniformsize', preserveStatus=[], "

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5a56c35/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
 
b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
index 4dd05de..907fc24 100644
--- 
a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
+++ 
b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
@@ -400,6 +400,7 @@ public class TestOptionsParser {
 DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz"));
 String val = "DistCpOptions{atomicCommit=false, syncFolder=false, "
 + "deleteMissing=false, ignoreFailures=false, overwrite=false, "
++ "append=false, useDiff=false, fromSnapshot=null, toSnapshot=null, "
 + "skipCRC=false, blocking=true, numListstatusThreads=0, maxMaps=20, "
 + "mapBandwidth=100, sslConfigurationFile='null', "
 + "copyStrategy='uniformsize', preserveStatus=[], "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: HADOOP-13034. Log message about input options in distcp lacks some items (Takashi Ohnishi via aw)

2016-06-28 Thread aw
Repository: hadoop
Updated Branches:
  refs/heads/trunk 23c3ff85a -> 422c73a86


HADOOP-13034. Log message about input options in distcp lacks some items 
(Takashi Ohnishi via aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/422c73a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/422c73a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/422c73a8

Branch: refs/heads/trunk
Commit: 422c73a8657d8699920f7db13d4be200e16c4272
Parents: 23c3ff8
Author: Allen Wittenauer 
Authored: Tue Jun 28 07:21:04 2016 -0700
Committer: Allen Wittenauer 
Committed: Tue Jun 28 07:21:04 2016 -0700

--
 .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java | 4 
 .../src/test/java/org/apache/hadoop/tools/TestOptionsParser.java | 1 +
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/422c73a8/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
index 1bc65e0..e6f53f5 100644
--- 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
+++ 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
@@ -632,6 +632,10 @@ public class DistCpOptions {
 ", deleteMissing=" + deleteMissing +
 ", ignoreFailures=" + ignoreFailures +
 ", overwrite=" + overwrite +
+", append=" + append +
+", useDiff=" + useDiff +
+", fromSnapshot=" + fromSnapshot +
+", toSnapshot=" + toSnapshot +
 ", skipCRC=" + skipCRC +
 ", blocking=" + blocking +
 ", numListstatusThreads=" + numListstatusThreads +

http://git-wip-us.apache.org/repos/asf/hadoop/blob/422c73a8/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
 
b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
index 35109cc..c46bcd9 100644
--- 
a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
+++ 
b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
@@ -387,6 +387,7 @@ public class TestOptionsParser {
 DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz"));
 String val = "DistCpOptions{atomicCommit=false, syncFolder=false, "
 + "deleteMissing=false, ignoreFailures=false, overwrite=false, "
++ "append=false, useDiff=false, fromSnapshot=null, toSnapshot=null, "
 + "skipCRC=false, blocking=true, numListstatusThreads=0, maxMaps=20, "
 + "mapBandwidth=100.0, "
 + "copyStrategy='uniformsize', preserveStatus=[], "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org