Github user rbnks commented on the pull request:
https://github.com/apache/incubator-streams/pull/95#issuecomment-58428396
To keep my repo up to date with Apache, I create a pull request and merge
in that pull request from Apache master to my forked repo master. There was a
merge conflict that I had to resolve which is why there are 2 commit hashes.
If there is a different way I should be merging Apache Master please let me
know.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
