GitHub user manuzhang opened a pull request: https://github.com/apache/incubator-gearpump/pull/206
Merge master into sql Be sure to do all of the following to help us incorporate your contribution quickly and easily: - [ ] Make sure the commit message is formatted like: `[GEARPUMP-<Jira issue #>] Meaningful description of pull request` - [ ] Make sure tests pass via `sbt clean test`. - [ ] Make sure old documentation affected by the pull request has been updated and new documentation added for new functionality. You can merge this pull request into a Git repository by running: $ git pull https://github.com/manuzhang/incubator-gearpump merge_master_into_sql Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-gearpump/pull/206.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 #206 ---- commit a9755cbec0426a3e11504640e87a2970071854a9 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-07-14T05:26:27Z Bump up version to 0.8.5-SNAPSHOT Author: manuzhang <owenzhang1...@gmail.com> Closes #193 from manuzhang/bump_up_version. commit e3c63ef2b51af6a6c4d97c91479b7c1f6082c0fe Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-07-17T08:02:09Z [GEARPUMP-325] Fix license issues Author: manuzhang <owenzhang1...@gmail.com> Closes #194 from manuzhang/fix_licenses. commit 05f68bc55aad8e56c0587995fce84fd471823bc1 Author: huafengw <fvunic...@gmail.com> Date: 2017-07-20T08:34:50Z [GEARPUMP-322] Fix multiple SLF4J bindings on classpath Author: huafengw <fvunic...@gmail.com> Closes #196 from huafengw/fix322. commit 50316ce31db34785c4af8261dd66d8a1740a5601 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-07-21T01:42:59Z [GEARPUMP-327] Put jarstore and logs under "gearpump.home" Author: manuzhang <owenzhang1...@gmail.com> Closes #197 from manuzhang/fix_jarstore_logs. commit a47e1a6dbe2ab594a891f48b2bb4f32b613f1b22 Author: darionyaphet <darion.yap...@gmail.com> Date: 2017-07-25T05:23:14Z [GEARPUMP-328] FetchThread fetchSleepMS from Int to Long currently *KafkaConfig.FETCH_SLEEP_MS_CONFIG* is a INT parameter , move it into a LONG parameter is better . Author: darionyaphet <darion.yap...@gmail.com> Closes #199 from darionyaphet/GEARPUMP-328. commit ac8ac039217725f9f924ec901fdf7adfd9f51657 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-07-26T02:28:25Z [GEARPUMP-330] Allow examples to run in `sbt run` and Intellij Author: manuzhang <owenzhang1...@gmail.com> Closes #200 from manuzhang/run_examples_in_ide. commit fa3f892d76ca932fae44587f7860030b32f401bf Author: huafengw <fvunic...@gmail.com> Date: 2017-07-31T06:36:38Z [GEARPUMP-331] Allow applications to be run in IDE Author: huafengw <fvunic...@gmail.com> Closes #202 from huafengw/GP331. commit 0f5f7221ea7ff01e4e2c0d6ee4f7f95b537f5298 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-08-02T06:20:55Z [GEARPUMP-333] Fix examples assembling Author: manuzhang <owenzhang1...@gmail.com> Closes #203 from manuzhang/fix_example_dep. commit 4ad0ec42819d81adeac57b13b772b023a8746aac Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-08-02T09:53:15Z [GEARPUMP-334] Fix Java WordCount DSL example Author: manuzhang <owenzhang1...@gmail.com> Closes #204 from manuzhang/fix_wc_java_dsl. commit 10d717e467474005fd0386c387c10f283269b59a Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-08-02T09:58:52Z Merge branch 'master' of https://github.com/apache/incubator-gearpump into sql # Conflicts: # examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/WordCount.scala # project/BuildExamples.scala ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---