[05/17] hadoop git commit: HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet Houghland.

2015-05-05 Thread jitendra 
HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet 
Houghland.


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

Branch: refs/heads/HDFS-7240
Commit: 05adc76ace6bf28e4a3ff874044c2c41e3eba63f
Parents: 9356cf8
Author: Andrew Wang w...@apache.org
Authored: Tue May 5 08:37:37 2015 -0700
Committer: Andrew Wang w...@apache.org
Committed: Tue May 5 08:37:37 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt| 2 ++
 .../src/main/java/org/apache/hadoop/fs/shell/Delete.java   | 2 +-
 .../hadoop-common/src/test/resources/testConf.xml  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05adc76a/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0b3c971..8b0e67c 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -528,6 +528,8 @@ Release 2.8.0 - UNRELEASED
 HADOOP-11328. ZKFailoverController does not log Exception when doRun raises
 errors. (Tianyin Xu via ozawa)
 
+HADOOP-11120. hadoop fs -rmr gives wrong advice. (Juliet Hougland via wang)
+
   OPTIMIZATIONS
 
 HADOOP-11785. Reduce the number of listStatus operation in distcp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05adc76a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index 6798fbe..f882817 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -141,7 +141,7 @@ class Delete {
 
 @Override
 public String getReplacementCommand() {
-  return rm -r;
+  return -rm -r;
 }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05adc76a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
--
diff --git 
a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml 
b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
index 9b72960..57cce14 100644
--- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
+++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
@@ -453,7 +453,7 @@
 /comparator
 comparator
   typeRegexpComparator/type
-  expected-output^\s*\(DEPRECATED\) Same as 'rm 
-r'\s*/expected-output
+  expected-output^\s*\(DEPRECATED\) Same as '-rm 
-r'\s*/expected-output
 /comparator
   /comparators
 /test

hadoop git commit: HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet Houghland.

2015-05-05 Thread wang 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 0f30913ea - 84d8ba4f7


HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet 
Houghland.

(cherry picked from commit 05adc76ace6bf28e4a3ff874044c2c41e3eba63f)


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

Branch: refs/heads/branch-2
Commit: 84d8ba4f722ce806391f3434268f08a96aae8741
Parents: 0f30913
Author: Andrew Wang w...@apache.org
Authored: Tue May 5 08:37:37 2015 -0700
Committer: Andrew Wang w...@apache.org
Committed: Tue May 5 08:37:41 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt| 2 ++
 .../src/main/java/org/apache/hadoop/fs/shell/Delete.java   | 2 +-
 .../hadoop-common/src/test/resources/testConf.xml  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/84d8ba4f/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index fd5bb4b..d885c41 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -70,6 +70,8 @@ Release 2.8.0 - UNRELEASED
 HADOOP-11328. ZKFailoverController does not log Exception when doRun raises
 errors. (Tianyin Xu via ozawa)
 
+HADOOP-11120. hadoop fs -rmr gives wrong advice. (Juliet Hougland via wang)
+
   OPTIMIZATIONS
 
 HADOOP-11785. Reduce the number of listStatus operation in distcp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/84d8ba4f/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index 6798fbe..f882817 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -141,7 +141,7 @@ class Delete {
 
 @Override
 public String getReplacementCommand() {
-  return rm -r;
+  return -rm -r;
 }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/84d8ba4f/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
--
diff --git 
a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml 
b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
index 3729cf9..d36efd5 100644
--- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
+++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
@@ -429,7 +429,7 @@
 /comparator
 comparator
   typeRegexpComparator/type
-  expected-output^\s*\(DEPRECATED\) Same as 'rm 
-r'\s*/expected-output
+  expected-output^\s*\(DEPRECATED\) Same as '-rm 
-r'\s*/expected-output
 /comparator
   /comparators
 /test

hadoop git commit: HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet Houghland.

2015-05-05 Thread wang 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 9356cf867 - 05adc76ac


HADOOP-11120. hadoop fs -rmr gives wrong advice. Contributed by Juliet 
Houghland.


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

Branch: refs/heads/trunk
Commit: 05adc76ace6bf28e4a3ff874044c2c41e3eba63f
Parents: 9356cf8
Author: Andrew Wang w...@apache.org
Authored: Tue May 5 08:37:37 2015 -0700
Committer: Andrew Wang w...@apache.org
Committed: Tue May 5 08:37:37 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt| 2 ++
 .../src/main/java/org/apache/hadoop/fs/shell/Delete.java   | 2 +-
 .../hadoop-common/src/test/resources/testConf.xml  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05adc76a/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0b3c971..8b0e67c 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -528,6 +528,8 @@ Release 2.8.0 - UNRELEASED
 HADOOP-11328. ZKFailoverController does not log Exception when doRun raises
 errors. (Tianyin Xu via ozawa)
 
+HADOOP-11120. hadoop fs -rmr gives wrong advice. (Juliet Hougland via wang)
+
   OPTIMIZATIONS
 
 HADOOP-11785. Reduce the number of listStatus operation in distcp

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05adc76a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index 6798fbe..f882817 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -141,7 +141,7 @@ class Delete {
 
 @Override
 public String getReplacementCommand() {
-  return rm -r;
+  return -rm -r;
 }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05adc76a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
--
diff --git 
a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml 
b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
index 9b72960..57cce14 100644
--- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
+++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
@@ -453,7 +453,7 @@
 /comparator
 comparator
   typeRegexpComparator/type
-  expected-output^\s*\(DEPRECATED\) Same as 'rm 
-r'\s*/expected-output
+  expected-output^\s*\(DEPRECATED\) Same as '-rm 
-r'\s*/expected-output
 /comparator
   /comparators
 /test