Github user vasia commented on the pull request:
https://github.com/apache/flink/pull/808#issuecomment-128420592
Hi @PieterJanVanAeken! Thanks for the update. It seems something went wrong
with your merge. Your last commit shows 1000+ files changed... Could you try to
rebase instead?
---
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.
---
