Github user rtudoran commented on the issue:
https://github.com/apache/flink/pull/3607
@sunjincheng121 - Apperently there were many conflicts...most of them were
stupid conflicts when git was trying to do the automatic merging.
At least in 2 classes the methods you added and the ones i added were put
one into the other...instead of one after the other. If you look over the
classes you we see that actually there are not so many actual modifications :)
---
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.
---
