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 wh...@apache.org on 2015/05/27 20:06:30 UTC

hadoop git commit: Revert HDFS-8135 in branch-2.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 9670762a8 -> cc348fead


Revert HDFS-8135 in branch-2.


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

Branch: refs/heads/branch-2
Commit: cc348fead72b13c7e9296118687a83c8b8a53269
Parents: 9670762
Author: Haohui Mai <wh...@apache.org>
Authored: Wed May 27 11:06:17 2015 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Wed May 27 11:06:17 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  2 --
 .../hadoop/hdfs/protocol/FSConstants.java       | 27 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc348fea/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 6981be8..06029cb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -4,8 +4,6 @@ Release 2.8.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
-    HDFS-8135. Remove the deprecated FSConstants class. (Li Lu via wheat9)
-
   NEW FEATURES
 
     HDFS-7891. A block placement policy with best rack failure tolerance.

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc348fea/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSConstants.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSConstants.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSConstants.java
new file mode 100644
index 0000000..17b2e58
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSConstants.java
@@ -0,0 +1,27 @@
+/**
+ * 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.hdfs.protocol;
+
+/**
+ * @deprecated Please use {@link HdfsConstants}. This class
+ * is left only for other ecosystem projects which depended on
+ * it for SafemodeAction and DatanodeReport types.
+ */
+@Deprecated
+public abstract class FSConstants extends HdfsConstants {
+}