Repository: hadoop Updated Branches: refs/heads/branch-2.8 2e8e51ad4 -> cdfa86cad
Revert "HADOOP-13606 swift FS to add a service load metadata file. Contributed by Steve Loughran" This reverts commit 53a12fa721bb431f7d481aac7d245c93efb56153. (cherry picked from commit 98142d2f722e82d57b0e2bae6276f7c17fd99598) Change-Id: I3a7613a7f4f0e9c80bb6d3c40a53742f807fc689 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cdfa86ca Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cdfa86ca Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cdfa86ca Branch: refs/heads/branch-2.8 Commit: cdfa86cadd81ad5063b785e43d282d3390491eff Parents: 2e8e51a Author: John Zhuge <[email protected]> Authored: Wed Mar 8 11:47:36 2017 -0800 Committer: John Zhuge <[email protected]> Committed: Wed Mar 8 11:47:36 2017 -0800 ---------------------------------------------------------------------- .../src/main/resources/core-default.xml | 6 ++++++ .../services/org.apache.hadoop.fs.FileSystem | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdfa86ca/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index b119bc7..4ca642c 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -719,6 +719,12 @@ </property> <property> + <name>fs.swift.impl</name> + <value>org.apache.hadoop.fs.swift.snative.SwiftNativeFileSystem</value> + <description>The implementation class of the OpenStack Swift Filesystem</description> +</property> + +<property> <name>fs.automatic.close</name> <value>true</value> <description>By default, FileSystem instances are automatically closed at program http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdfa86ca/hadoop-tools/hadoop-openstack/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-openstack/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem b/hadoop-tools/hadoop-openstack/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem deleted file mode 100644 index 649ea31..0000000 --- a/hadoop-tools/hadoop-openstack/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.hadoop.fs.swift.snative.SwiftNativeFileSystem --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
