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/e71b8d14 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e71b8d14 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e71b8d14 Branch: refs/heads/YARN-5355_branch2 Commit: e71b8d14fe8cdf0952bc1b87668b545244804318 Parents: ec1936a Author: Varun Saxena <varunsax...@apache.org> Authored: Tue Aug 22 11:32:45 2017 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Thu Aug 31 01:41:58 2017 +0530 ---------------------------------------------------------------------- .../timelineservice/reader/TimelineReaderWebServices.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e71b8d14/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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
