HDFS-3679. merging change 1366545 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366546 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
af0cc1c7c0
commit
117c16edfe
|
@ -123,7 +123,8 @@ Release 2.0.1-alpha - UNRELEASED
|
||||||
HDFS-3613. GSet prints some INFO level values, which aren't
|
HDFS-3613. GSet prints some INFO level values, which aren't
|
||||||
really very useful to all (Andrew Wang via harsh)
|
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)
|
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-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
|
BREAKDOWN OF HDFS-3042 SUBTASKS
|
||||||
|
|
||||||
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
|
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
|
||||||
|
|
|
@ -124,7 +124,7 @@ int dfs_options(void *data, const char *arg, int key, struct fuse_args *outargs
|
||||||
options.usetrash = 1;
|
options.usetrash = 1;
|
||||||
break;
|
break;
|
||||||
case KEY_NOTRASH:
|
case KEY_NOTRASH:
|
||||||
options.usetrash = 1;
|
options.usetrash = 0;
|
||||||
break;
|
break;
|
||||||
case KEY_RO:
|
case KEY_RO:
|
||||||
options.read_only = 1;
|
options.read_only = 1;
|
||||||
|
|
Loading…
Reference in New Issue