diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index fd70e6ac401..72a234c91a9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -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) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c index 35829743041..8461ce40f91 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/fuse-dfs/fuse_options.c @@ -124,7 +124,7 @@ int dfs_options(void *data, const char *arg, int key, struct fuse_args *outargs options.usetrash = 1; break; case KEY_NOTRASH: - options.usetrash = 1; + options.usetrash = 0; break; case KEY_RO: options.read_only = 1;