diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
index ca7edcc7ac..798d4fb1ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
@@ -197,7 +197,6 @@ private void enforceRootPath(HttpFSFileSystem.Operation op, String path) {
    * {@link HttpFSExceptionProvider}.
    */
   @GET
-  @Path("/")
   @Produces(MediaType.APPLICATION_JSON)
   public Response getRoot(@Context Principal user,
                           @QueryParam(OperationParam.NAME) OperationParam op,
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index bdf03d932d..802f59cedc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -897,6 +897,9 @@ Release 2.0.5-beta - UNRELEASED
     HDFS-4827. Slight update to the implementation of API for handling favored
     nodes in DFSClient (ddas)
 
+    HDFS-4865. Remove sub resource warning from httpfs log at startup time. 
+    (ywskycn via tucu)
+
   BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
 
     HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.