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

Cherry-pick add a new after-async or async phase to triggers #1735

Merged
merged 1 commit into from
Dec 4, 2020

Conversation

ivangreene
Copy link
Contributor

Fixes #1731

Just cherry picked the commit from #1573 and resolved the conflicts

Proposed Changes (Mandatory)

A brief list of proposed changes in order to fix the issue:

@mneedham
Copy link
Contributor

mneedham commented Dec 4, 2020

Hey @ivangreene,

I think the changes in this PR are already merged into the 4.1 branch. At least when I check TriggerHandler I can see most of the changes - https://github.com/neo4j-contrib/neo4j-apoc-procedures/blob/4.1/core/src/main/java/apoc/trigger/TriggerHandler.java

Can you confirm?

Cheers, Mark

@ivangreene
Copy link
Contributor Author

@mneedham yeah I cherry picked this commit from the 4.1 branch, but this PR is targeting 4.2. It looks like 4.2 and 4.3 branches were created from 4.1 before this change landed, so they never made it there: https://github.com/neo4j-contrib/neo4j-apoc-procedures/blob/4.2/core/src/main/java/apoc/trigger/TriggerHandler.java

…ggers (neo4j-contrib#1573)

* fixes neo4j-contrib#1547: Add a new after-async or async phase to triggers

* Changed parameters to new syntax

* Added "and thread" in afterAsync description

Co-authored-by: Michael Hunger <github@jexp.de>
Co-authored-by: Mark Needham <m.h.needham@gmail.com>
@ivangreene
Copy link
Contributor Author

Just rebased to resolve the conflicts

@mneedham
Copy link
Contributor

mneedham commented Dec 4, 2020

ah got it. That makes more sense!

@mneedham mneedham merged commit 171dcbf into neo4j-contrib:4.2 Dec 4, 2020
conker84 added a commit to conker84/neo4j-apoc-procedures that referenced this pull request Mar 29, 2021
…ggers (neo4j-contrib#1573) (neo4j-contrib#1735)

* fixes neo4j-contrib#1547: Add a new after-async or async phase to triggers

* Changed parameters to new syntax

* Added "and thread" in afterAsync description

Co-authored-by: Michael Hunger <github@jexp.de>
Co-authored-by: Mark Needham <m.h.needham@gmail.com>

Co-authored-by: Andrea Santurbano <santand@gmail.com>
Co-authored-by: Michael Hunger <github@jexp.de>
Co-authored-by: Mark Needham <m.h.needham@gmail.com>
conker84 added a commit that referenced this pull request Apr 12, 2021
…#1735)

* fixes #1547: Add a new after-async or async phase to triggers

* Changed parameters to new syntax

* Added "and thread" in afterAsync description

Co-authored-by: Michael Hunger <github@jexp.de>
Co-authored-by: Mark Needham <m.h.needham@gmail.com>

Co-authored-by: Andrea Santurbano <santand@gmail.com>
Co-authored-by: Michael Hunger <github@jexp.de>
Co-authored-by: Mark Needham <m.h.needham@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants