Author: suresh
Date: Fri Jul 27 21:56:01 2012
New Revision: 1366549
URL: http://svn.apache.org/viewvc?rev=1366549&view=rev
Log:
HDFS-3679. merging change 1366545 from trunk
Modified:
hadoop/common/branches/branch-1/src/contrib/fuse-dfs/src/fuse_options.c
Modified:
hadoop/common/branches/branch-1/src/contrib/fuse-dfs/src/fuse_options.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/fuse-dfs/src/fuse_options.c?rev=1366549&r1=1366548&r2=1366549&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/contrib/fuse-dfs/src/fuse_options.c
(original)
+++ hadoop/common/branches/branch-1/src/contrib/fuse-dfs/src/fuse_options.c Fri
Jul 27 21:56:01 2012
@@ -110,7 +110,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;