GitHub user manuzhang opened a pull request: https://github.com/apache/incubator-gearpump/pull/137
[GERAPUMP-22] Merge akka-streams branch into master 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 akka-streams Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-gearpump/pull/137.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 #137 ---- commit 4fe5458f45e1f1a9da84704d7c4d7eaff3b625bb Author: Kam Kasravi <kamkasr...@yahoo.com> Date: 2016-10-11T02:32:04Z Fixes #22 support akka-streams Gearpump Materializer Author: Kam Kasravi <kamkasr...@yahoo.com> Closes #94 from kkasravi/GEARPUMP-22. commit bc39403525b4065360acf82386fac21a588b59e6 Author: manuzhang <owenzhang1...@gmail.com> Date: 2016-10-11T03:57:48Z Merge branch 'master' into akka-streams Author: manuzhang <owenzhang1...@gmail.com> Author: darionyaphet <darion.yap...@gmail.com> Closes #95 from manuzhang/akka-streams. commit f1bec67098b80f9bffe719f885f8d089344a5579 Author: manuzhang <owenzhang1...@gmail.com> Date: 2016-10-12T06:30:49Z update akkastream against latests Graph DSL Author: manuzhang <owenzhang1...@gmail.com> Closes #97 from manuzhang/akka-streams-new. commit efed8e7ec4b31ee4517a3c0639758fb33eb1510f Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-01-20T05:37:58Z Merge branch 'master' into akka-streams # Conflicts: # core/src/main/scala/org/apache/gearpump/cluster/UserConfig.scala # examples/streaming/wordcount/src/main/scala/org/apache/gearpump/streaming/examples/wordcount/dsl/WindowedWordCount.scala # experiments/redis/src/main/scala/org/apache/gearpump/redis/RedisMessage.scala # experiments/redis/src/main/scala/org/apache/gearpump/redis/RedisSink.scala # project/Build.scala # project/BuildShaded.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/Stream.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/javaapi/JavaStream.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/partitioner/GroupByPartitioner.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/plan/OP.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/plan/functions/SingleInputFunction.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/CountTriggerTask.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/EventTimeTriggerTask.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/ProcessingTimeTriggerTask.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/task/TransformTask.scala # streaming/src/main/scala/org/apache/gearpump/streaming/dsl/window/impl/WindowRunner.scala # streaming/src/main/scala/org/apache/gearpump/streaming/task/TaskActor.scala # streaming/src/test/scala/org/apache/gearpump/streaming/dsl/plan/OpSpec.scala # streaming/src/test/scala/org/apache/gearpump/streaming/dsl/plan/PlannerSpec.scala # streaming/src/test/scala/org/apache/gearpump/streaming/dsl/plan/functions/SingleInputFunctionSpec.scala # streaming/src/test/scala/org/apache/gearpump/streaming/dsl/scalaapi/StreamAppSpec.scala # streaming/src/test/scala/org/apache/gearpump/streaming/dsl/scalaapi/StreamSpec.scala commit 3e61236faef44bf93d7943e8eea76c8cdfca5ac2 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-01-20T05:38:31Z Fix compile errors commit bd2d5bb44cb762f7c93737bed9860e1eb33ccf81 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-01-20T07:26:08Z Add scalastyle-config.xml commit 5539150e187bb9271a2a7337857cfdedf0c3b827 Author: manuzhang <owenzhang1...@gmail.com> Date: 2017-01-20T08:27:38Z Fix scalastyle ---- --- 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. ---