From 33dfb72fa3efc64395da437c99d3a89083856708 Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Mon, 27 Mar 2017 15:26:13 -0700 Subject: [PATCH] HDFS-11355. Block Storage : Merge configuration into ozone configuration classes. Contributed by Chen Liang. --- .../hadoop/cblock/CBlockConfiguration.java | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockConfiguration.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockConfiguration.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockConfiguration.java deleted file mode 100644 index d44f4246301..00000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockConfiguration.java +++ /dev/null @@ -1,33 +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. - */ -package org.apache.hadoop.cblock; - -import org.apache.hadoop.conf.Configuration; - -/** - * This class specifies the CBlock configuration resources. - */ -public class CBlockConfiguration extends Configuration { - static { - // adds the default resources - Configuration.addDefaultResource("hdfs-default.xml"); - Configuration.addDefaultResource("hdfs-site.xml"); - Configuration.addDefaultResource("cblock-default.xml"); - Configuration.addDefaultResource("cblock-site.xml"); - } -}