You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2018/11/19 11:17:31 UTC

[ambari] 02/02: Delete hdfs_resource.py.rej

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 5bc2e578942ef3af46c7be86d11803a58fbb126c
Author: aonishuk <ao...@hortonworks.com>
AuthorDate: Mon Nov 19 12:34:24 2018 +0200

    Delete hdfs_resource.py.rej
---
 .../libraries/providers/hdfs_resource.py.rej                  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py.rej b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py.rej
deleted file mode 100644
index 0220898..0000000
--- a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
-+++ ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
-@@ -686,7 +686,7 @@ class HdfsResourceProvider(Provider):
-       path_protocol = urlparse(self.resource.target).scheme.lower()
-       default_fs_protocol = urlparse(self.resource.default_fs).scheme.lower()
-       
--      self.create_as_root = path_protocol == 'file' or default_fs_protocol == 'file' and path_protocol == None
-+      self.create_as_root = path_protocol == 'file' or default_fs_protocol == 'file' and not path_protocol
- 
-       # for protocols which are different that defaultFs webhdfs will not be able to create directories
-       # so for them fast-hdfs-resource.jar should be used