hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From varunsax...@apache.org
Subject hadoop git commit: YARN-6861. Addendum for YARN-6861 for compilation issue (Rohith Sharma K S via Varun Saxena)
Date Tue, 22 Aug 2017 06:03:06 GMT
Repository: hadoop
Updated Branches:
  refs/heads/YARN-5355_branch2 ef1a22a8f -> f08759efc


YARN-6861. Addendum for YARN-6861 for compilation issue (Rohith Sharma K S via Varun Saxena)


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

Branch: refs/heads/YARN-5355_branch2
Commit: f08759efcd5a73ea2f9f1fd96e90d9fb95767c99
Parents: ef1a22a
Author: Varun Saxena <varunsaxena@apache.org>
Authored: Tue Aug 22 11:32:45 2017 +0530
Committer: Varun Saxena <varunsaxena@apache.org>
Committed: Tue Aug 22 11:32:45 2017 +0530

----------------------------------------------------------------------
 .../timelineservice/reader/TimelineReaderWebServices.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f08759ef/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
index bbaaaaf..fe4fd78 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
@@ -3247,7 +3247,7 @@ public class TimelineReaderWebServices {
 
   @GET
   @Path("/users/{userid}/entities/{entitytype}")
-  @Produces(MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8)
+  @Produces(MediaType.APPLICATION_JSON)
   public Set<TimelineEntity> getSubAppEntities(
       @Context HttpServletRequest req,
       @Context HttpServletResponse res,
@@ -3278,7 +3278,7 @@ public class TimelineReaderWebServices {
 
   @GET
   @Path("/clusters/{clusterid}/users/{userid}/entities/{entitytype}")
-  @Produces(MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8)
+  @Produces(MediaType.APPLICATION_JSON)
   public Set<TimelineEntity> getSubAppEntities(
       @Context HttpServletRequest req,
       @Context HttpServletResponse res,
@@ -3339,7 +3339,7 @@ public class TimelineReaderWebServices {
 
   @GET
   @Path("/users/{userid}/entities/{entitytype}/{entityid}")
-  @Produces(MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8)
+  @Produces(MediaType.APPLICATION_JSON)
   public Set<TimelineEntity> getSubAppEntities(@Context HttpServletRequest req,
       @Context HttpServletResponse res, @PathParam("userid") String userId,
       @PathParam("entitytype") String entityType,
@@ -3358,7 +3358,7 @@ public class TimelineReaderWebServices {
 
   @GET
   @Path("/clusters/{clusterid}/users/{userid}/entities/{entitytype}/{entityid}")
-  @Produces(MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8)
+  @Produces(MediaType.APPLICATION_JSON)
   public Set<TimelineEntity> getSubAppEntities(@Context HttpServletRequest req,
       @Context HttpServletResponse res,
       @PathParam("clusterid") String clusterId,


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


Mime
View raw message