Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Fix #2029 - add Produces JSON annotation to AppTasksResource
Browse files Browse the repository at this point in the history
  • Loading branch information
meichstedt committed Aug 19, 2015
1 parent cd2cc6b commit 800ad8c
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import org.apache.log4j.Logger
import scala.concurrent.Future

@Consumes(Array(MediaType.APPLICATION_JSON))
@Produces(Array(MarathonMediaType.PREFERRED_APPLICATION_JSON))
class AppTasksResource @Inject() (service: MarathonSchedulerService,
taskTracker: TaskTracker,
taskKiller: TaskKiller,
Expand All @@ -29,7 +30,6 @@ class AppTasksResource @Inject() (service: MarathonSchedulerService,
val GroupTasks = """^((?:.+/)|)\*$""".r

@GET
@Produces(Array(MarathonMediaType.PREFERRED_APPLICATION_JSON))
@Timed
def indexJson(@PathParam("appId") appId: String): Response = {

Expand Down

0 comments on commit 800ad8c

Please sign in to comment.