Skip to content

Conversation

Hapcy
Copy link

@Hapcy Hapcy commented Nov 28, 2016

Thanks for contributing to Apache Flink. Before you open your pull request, please take the following check list into consideration.
If your changes take all of the items into account, feel free to open your pull request. For more information and/or questions please refer to the How To Contribute guide.
In addition to going through the list, please provide a meaningful description of your changes.

  • General

    • The pull request references the related JIRA issue ("[FLINK-XXX] Jira title text")
    • The pull request addresses only one issue
    • Each commit in the PR has a meaningful commit message (including the JIRA id)
  • Documentation --- not touched

    • Documentation has been added for new functionality
    • Old documentation affected by the pull request has been updated
    • JavaDoc for public methods has been added
  • Tests & Build

    • Functionality added by the pull request is covered by tests
    • mvn clean verify has been executed successfully locally or a Travis build has passed --- Travis build failed but I had nothing to do with those parts of the code.

I'm kind of newbie and some other people's commits showed up as commited with me but I have nothing to do with them.

tibor.moger and others added 11 commits November 28, 2016 16:51
Allowing Trigger.onMerge() to return a TriggerResult is not necessary
since an onMerge() call will always be followed by an onElement() call
when adding the element that caused the merging to the merged window.
Having this complicates the internal logic of the WindowOperator and
makes writing Triggers more confusing than it has to be.
This transitive dependency has an incompatible license.

This closes #2824
… AbstractTaskManagerProcessFailureRecoveryTest
@greghogan
Copy link
Contributor

Hi @Hapcy, thanks for submitting this PR.

It's best to create a feature branch for each ticket rather than committing to master. You can fix this by creating a branch (git checkout master ; git checkout -b 5109_invalid_content_encoding_header_in_rest_api_responses) then resetting master (git checkout master ; git reset --hard 7f1c76d^ ; git rebase upstream/master) then rebasing against master (git checkout 5109_invalid_content_encoding_header_in_rest_api_responses ; git rebase master ; git push -f origin 5109_invalid_content_encoding_header_in_rest_api_responses).

Something like that. Make a copy of everything first.

@Hapcy
Copy link
Author

Hapcy commented Nov 29, 2016

Thank you for your feedback!
I followed your instructions and submitted another PR - #2898
I'll close this PR for now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants