GitHub user ahutsunshine opened a pull request:
https://github.com/apache/incubator-griffin/pull/156
fix job conflict
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ahutsunshine/incubator-griffin master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-griffin/pull/156.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #156
----
commit f116a4c833344473b6a07f4d2f0022fd7944e3ba
Author: ahutsunshine <[email protected]>
Date: 2017-10-15T14:04:12Z
update several coding style
commit 4a688e56f7225288c3360261735cbf97d8e2cb53
Author: ahutsunshine <[email protected]>
Date: 2017-10-16T04:34:48Z
Merge branch 'master' of https://github.com/apache/incubator-griffin
commit 53804676b51d76fbcea2f2dec97a3861d61b25f1
Author: ahutsunshine <[email protected]>
Date: 2017-10-16T05:28:59Z
Merge branch 'master' of https://github.com/apache/incubator-griffin
commit 0cd65ee8bf4f62eb86c94ffc3da23deb23207680
Author: ahutsunshine <[email protected]>
Date: 2017-10-16T08:22:53Z
optimize hive cache and update measure to json with format
commit db2f141c099812159dff84b0b0c6d1082aff594f
Author: ahutsunshine <[email protected]>
Date: 2017-10-16T09:01:33Z
update hive cache
commit 1ffa2efccd88604a6caaad7f2532053d43809ceb
Author: ahutsunshine <[email protected]>
Date: 2017-10-16T09:06:03Z
update hive cache
commit 7019b53c5697806f701b91de7d4a10776a7e72f8
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T04:57:23Z
swagger, structure modification, hive metastore bug fix, ut updated
commit 2545faf3fa7e39fa2084b39dcd1e9e44b7349e00
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T04:58:04Z
swagger, structure modification, hive metastore bug fix, ut updated
commit 9b0cb273c5a752f5e46f729bb5b3e72789d24337
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T04:58:40Z
Merge branch 'master' of https://github.com/apache/incubator-griffin
commit 72f7b9356a6db6924b0e6ffcb95b0f8d8af4b8e4
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T05:09:58Z
add postman document
commit 487d6432603ebda5e046f4a1a04fc543377f3817
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T05:41:40Z
hide part of controller
commit ee761e2e69c005eb5c1980693d42f3eb9411c5e8
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T08:10:26Z
add license and fix swagger ui
commit 07d92346ecba0d6467d07426979011d249a80d98
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T08:12:54Z
add license and fix swagger ui
commit 0afa6c37583ea626b22dcc29cb1361709a9da8d4
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T08:38:52Z
fix job conflict
commit 17d196e997f37a20434441ba5ac764bc63739c01
Author: ahutsunshine <[email protected]>
Date: 2017-10-30T08:40:18Z
fix job conflict
----
---
