tree 65d1d88853dcd6b102f66e2f904d8409ada86777
parent f1bec67098b80f9bffe719f885f8d089344a5579
author manuzhang <owenzhang1990@gmail.com> 1484902050 +0800
committer huafengw <fvunicorn@gmail.com> 1484902050 +0800

merge master into akka-streams branch

Be sure to do all of the following to help us incorporate your contribution
quickly and easily:

 - [x] Make sure the commit message is formatted like:
   `[GEARPUMP-<Jira issue #>] Meaningful description of pull request`
 - [x] Make sure tests pass via `sbt clean test`.
 - [x] Make sure old documentation affected by the pull request has been updated and new documentation added for new functionality.

Author: manuzhang <owenzhang1990@gmail.com>
Author: huafengw <fvunicorn@gmail.com>
Author: Kam Kasravi <kamkasravi@yahoo.com>
Author: darionyaphet <darion.yaphet@gmail.com>
Author: Roshanson <736781877@qq.com>
Author: Willem Jiang <willem.jiang@gmail.com>
Author: Christoph Seifert <christoph.seifert27@googlemail.com>
Author: ganesh@thedatateam.in <ganesh@thedatateam.in>

Closes #136 from manuzhang/akka-streams.