Repository: incubator-griffin Updated Branches: refs/heads/master ee96b9f69 -> 09cc35064
fix job conflict Author: ahutsunshine <[email protected]> Closes #156 from ahutsunshine/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/09cc3506 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/09cc3506 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/09cc3506 Branch: refs/heads/master Commit: 09cc35064bbcc829d9e034d3b7e225bb1ca1f494 Parents: ee96b9f Author: ahutsunshine <[email protected]> Authored: Mon Oct 30 16:43:29 2017 +0800 Committer: Lionel Liu <[email protected]> Committed: Mon Oct 30 16:43:29 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/griffin/core/job/JobController.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/09cc3506/service/src/main/java/org/apache/griffin/core/job/JobController.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/job/JobController.java b/service/src/main/java/org/apache/griffin/core/job/JobController.java index e40e5ad..0e12baf 100644 --- a/service/src/main/java/org/apache/griffin/core/job/JobController.java +++ b/service/src/main/java/org/apache/griffin/core/job/JobController.java @@ -35,11 +35,7 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -<<<<<<< HEAD @Api(tags = "Jobs", description = "execute your measure periodically") -======= -@Api(tags = "Jobs",description = "execute your measure periodically") ->>>>>>> 1f984da1aea86e8be507db37f426b5e28d0d81e8 @RestController @RequestMapping("/api/v1/jobs") public class JobController {
