Author: suresh
Date: Fri Jul 27 21:53:13 2012
New Revision: 1366546
URL: http://svn.apache.org/viewvc?rev=1366546&view=rev
Log:
HDFS-3679. merging change 1366545 from trunk to branch-2
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1366546&r1=1366545&r2=1366546&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Jul 27 21:53:13 2012
@@ -123,7 +123,8 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3613. GSet prints some INFO level values, which aren't
really very useful to all (Andrew Wang via harsh)
- HDFS-3611. NameNode prints unnecessary WARNs about edit log normally
skipping a few bytes. (Colin Patrick McCabe via harsh)
+ HDFS-3611. NameNode prints unnecessary WARNs about edit log normally
skipping
+ a few bytes. (Colin Patrick McCabe via harsh)
HDFS-3582. Hook daemon process exit for testing. (eli)
@@ -384,6 +385,8 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3626. Creating file with invalid path can corrupt edit log (todd)
+ HDFS-3679. fuse_dfs notrash option sets usetrash. (Conrad Meyer via suresh)
+
BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c?rev=1366546&r1=1366545&r2=1366546&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c
Fri Jul 27 21:53:13 2012
@@ -124,7 +124,7 @@ int dfs_options(void *data, const char *
options.usetrash = 1;
break;
case KEY_NOTRASH:
- options.usetrash = 1;
+ options.usetrash = 0;
break;
case KEY_RO:
options.read_only = 1;
