[12/46] hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Addendum patch for Configuration fix. (Jason Lowe via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b07e68b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b07e68b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b07e68b0 Branch: refs/heads/YARN-5881 Commit: b07e68b02a34d272114dda4194992a847928aef8 Parents: 4908a89 Author: Arun SureshAuthored: Mon Nov 13 14:03:50 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 14:03:50 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b07e68b0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index dfbeec7..fce2194 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2962,7 +2962,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2983,7 +2984,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[37/50] [abbrv] hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Addendum patch for Configuration fix. (Jason Lowe via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b07e68b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b07e68b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b07e68b0 Branch: refs/heads/HDFS-7240 Commit: b07e68b02a34d272114dda4194992a847928aef8 Parents: 4908a89 Author: Arun SureshAuthored: Mon Nov 13 14:03:50 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 14:03:50 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b07e68b0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index dfbeec7..fce2194 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2962,7 +2962,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2983,7 +2984,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[46/50] [abbrv] hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Addendum patch for Configuration fix. (Jason Lowe via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b07e68b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b07e68b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b07e68b0 Branch: refs/heads/YARN-6592 Commit: b07e68b02a34d272114dda4194992a847928aef8 Parents: 4908a89 Author: Arun SureshAuthored: Mon Nov 13 14:03:50 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 14:03:50 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b07e68b0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index dfbeec7..fce2194 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2962,7 +2962,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2983,7 +2984,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Repository: hadoop Updated Branches: refs/heads/branch-3.0 c2f479c24 -> f6de2b741 Addendum patch for Configuration fix. (Jason Lowe via asuresh) (cherry picked from commit b07e68b02a34d272114dda4194992a847928aef8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6de2b74 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6de2b74 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6de2b74 Branch: refs/heads/branch-3.0 Commit: f6de2b741ed75aecdd5244ce4a360b9780b53251 Parents: c2f479c Author: Arun SureshAuthored: Mon Nov 13 14:03:50 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 14:05:41 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6de2b74/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 6c061a4..18e6e6e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2936,7 +2936,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2957,7 +2958,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Repository: hadoop Updated Branches: refs/heads/trunk 4908a8970 -> b07e68b02 Addendum patch for Configuration fix. (Jason Lowe via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b07e68b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b07e68b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b07e68b0 Branch: refs/heads/trunk Commit: b07e68b02a34d272114dda4194992a847928aef8 Parents: 4908a89 Author: Arun SureshAuthored: Mon Nov 13 14:03:50 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 14:03:50 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b07e68b0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index dfbeec7..fce2194 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2962,7 +2962,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2983,7 +2984,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Repository: hadoop Updated Branches: refs/heads/branch-2.9.0 1eb05c1dd -> 9a89a3e0b Addendum patch for Configuration fix. (Jason Lowe via asuresh) (cherry picked from commit 4e847d63a39268d8a34e0f22ddb5e40c5ef71e3a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a89a3e0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a89a3e0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a89a3e0 Branch: refs/heads/branch-2.9.0 Commit: 9a89a3e0b09a2eae6aabadd510fa48c5e18c0dcc Parents: 1eb05c1 Author: Arun SureshAuthored: Mon Nov 13 13:49:08 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 13:51:13 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a89a3e0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 2532570..283308b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2852,7 +2852,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2873,7 +2874,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Repository: hadoop Updated Branches: refs/heads/branch-2.9 238a70c6c -> ed0658a57 Addendum patch for Configuration fix. (Jason Lowe via asuresh) (cherry picked from commit 4e847d63a39268d8a34e0f22ddb5e40c5ef71e3a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ed0658a5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ed0658a5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ed0658a5 Branch: refs/heads/branch-2.9 Commit: ed0658a57903cd8abdcb7caaf54d7bf3e1f618ab Parents: 238a70c Author: Arun SureshAuthored: Mon Nov 13 13:49:08 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 13:50:44 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed0658a5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 2532570..283308b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2852,7 +2852,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2873,7 +2874,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: Addendum patch for Configuration fix. (Jason Lowe via asuresh)
Repository: hadoop Updated Branches: refs/heads/branch-2 30ab9b6ae -> 4e847d63a Addendum patch for Configuration fix. (Jason Lowe via asuresh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e847d63 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e847d63 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e847d63 Branch: refs/heads/branch-2 Commit: 4e847d63a39268d8a34e0f22ddb5e40c5ef71e3a Parents: 30ab9b6 Author: Arun SureshAuthored: Mon Nov 13 13:49:08 2017 -0800 Committer: Arun Suresh Committed: Mon Nov 13 13:49:08 2017 -0800 -- .../src/main/java/org/apache/hadoop/conf/Configuration.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e847d63/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java -- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 2532570..283308b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -2852,7 +2852,8 @@ public class Configuration implements Iterable >, // xi:include are treated as inline and retain current source URL include = getResource(confInclude); if (include != null) { - Resource classpathResource = new Resource(include, name); + Resource classpathResource = new Resource(include, name, + wrapper.isParserRestricted()); loadResource(properties, classpathResource, quiet); } else { URL url; @@ -2873,7 +2874,8 @@ public class Configuration implements Iterable >, } url = href.toURI().toURL(); } - Resource uriResource = new Resource(url, name); + Resource uriResource = new Resource(url, name, + wrapper.isParserRestricted()); loadResource(properties, uriResource, quiet); } break; - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org