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 va...@apache.org on 2017/10/17 18:14:01 UTC
[38/50] [abbrv] hadoop git commit: YARN-6861. Addendum for YARN-6861
for compilation issue (Rohith Sharma K S via Varun Saxena)
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/e5d63652
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5d63652
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5d63652
Branch: refs/heads/branch-2
Commit: e5d63652dfdfa7f99976c1ddba4762768d145f37
Parents: 186c99c
Author: Varun Saxena <va...@apache.org>
Authored: Tue Aug 22 11:32:45 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Tue Oct 17 23:36:40 2017 +0530
----------------------------------------------------------------------
.../timelineservice/reader/TimelineReaderWebServices.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5d63652/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