Github user masaki-yamakawa commented on the issue:
https://github.com/apache/geode/pull/474
@bschuchardt
Thank you for pointing it out. I resolved the conflicts.
Travis CI's BUILD failed, but I think it is the effect of GEODE-2959 change.
---
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.
---
