Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DraftPublished and ChangeMerged -> Replication #185

Merged
merged 1 commit into from Oct 15, 2014

Conversation

Projects
None yet
5 participants
@scoheb
Copy link
Contributor

commented Oct 15, 2014

The Draft Published event is now handled correctly by ensuring that
Gerrit Trigger does not wait for a replicaton event from the slave.

The Change Merged event is now handled correctly by ensuring that we
wait for the replication event for the included patchset on the slave.

These use cases were covered:

  • The user merges his/her change to master and there is no change in SHA1
    -- The replication has already occurred.
  • The user merges his/her change to master and there is a change in SHA1
    since there already other changes merged after the patchset was created.
    -- a new replication takes place and must be waited for.

[FIXED JENKINS-25047]

escoheb
Fix DraftPublished and ChangeMerged -> Replication
The Draft Published event is now handled correctly by ensuring that
Gerrit Trigger does not wait for a replicaton event from the slave.

The Change Merged event is now handled correctly by ensuring that we
wait for the replication event for the included patchset on the slave.

These use cases were covered:
- The user merges his/her change to master and there is no change in SHA1
  -- The replication has already occurred.
- The user merges his/her change to master and there is a change in SHA1
since there already other changes merged after the patchset was created.
  -- a new replication takes place and must be waited for.

[FIXED JENKINS-25047]
@jenkinsadmin

This comment has been minimized.

Copy link
Member

commented Oct 15, 2014

Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests

@rsandell

This comment has been minimized.

Copy link
Member

commented Oct 15, 2014

👍 A lot of whitespace changes that makes it a bit confusing to read at times.
But I see no problems with it in the quick read through.
Waiting for someone else to take a look as well before merging.

@TWestling

This comment has been minimized.

Copy link
Member

commented Oct 15, 2014

I agree, both on the whitespace making the change look bigger than it is and that it looks good.

@hugares

This comment has been minimized.

Copy link
Member

commented Oct 15, 2014

+1

rsandell added a commit that referenced this pull request Oct 15, 2014

Merge pull request #185 from scoheb/replication-fixes
Fix DraftPublished and ChangeMerged -> Replication

@rsandell rsandell merged commit 84530eb into jenkinsci:master Oct 15, 2014

1 check passed

default This pull request looks good
Details
@rsandell

This comment has been minimized.

Copy link
Member

commented Oct 15, 2014

I'll do the beta-5 release now. Hopefully that is the last beta, but all help in testing is appreciated. There's still the reload memory leak issue, but that is present in 2.11 as well so I don't think there is anything new there.

@scoheb

This comment has been minimized.

Copy link
Contributor Author

commented Oct 15, 2014

Please see my most recent email...

@rsandell

This comment has been minimized.

Copy link
Member

commented Oct 15, 2014

Ok, holding release for a while then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.