You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2017/03/27 22:29:30 UTC

hadoop git commit: HDFS-11355. Block Storage : Merge configuration into ozone configuration classes. Contributed by Chen Liang.

Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 ed14373a9 -> 33dfb72fa


HDFS-11355. Block Storage : Merge configuration into ozone configuration classes. Contributed by Chen Liang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33dfb72f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33dfb72f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33dfb72f

Branch: refs/heads/HDFS-7240
Commit: 33dfb72fa3efc64395da437c99d3a89083856708
Parents: ed14373
Author: Anu Engineer <ae...@apache.org>
Authored: Mon Mar 27 15:26:13 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Mon Mar 27 15:26:13 2017 -0700

----------------------------------------------------------------------
 .../hadoop/cblock/CBlockConfiguration.java      | 33 --------------------
 1 file changed, 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/33dfb72f/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 d44f424..0000000
--- 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");
-  }
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org