Versions Compared

Old Version 2

changes.mady.by.user Gwen Shapira

Saved on

compared with

New Version 3

changes.mady.by.user Ismael Juma Juma

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Update "Merging" instructions.

...

Once the pull request is ready to be merged (it :

  1. It has been reviewed

...

  1. and feedback has been addressed

...

  1. .
  2. The branch merges cleanly to trunk. If the branch merges cleanly to a stable branch, the code hasn't diverged and the committer deems it safe, it's OK to cherry-pick to a stable branch via the merge script. Otherwise, a separate PR should be submitted for the backport so that it can be reviewed and tested.
  3. Unit and integration tests have passed via the automated PR builds.
  4. System tests have passed, if applicable. For non trivial changes, we recommend running the system tests via https://jenkins.confluent.io/job/system-test-kafka-branch-builder/ before merging the PR. This is a manual process at the moment and it would be good to automate it in the future.

1. Set the JIRA_USERNAME and JIRA_PASSWORD environment variables with the appropriate credentials if you intend to ask the script to close the issue associated with the pull request.

...