Github user jeking3 commented on the pull request:
https://github.com/apache/thrift/pull/428#issuecomment-91284246
There was no conflict with master however I need to base THRIFT-3083 on top
of these changes so I needed to refresh it.
---
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.
---
