Skip to content

Tklovett builder consistency #524

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.

Sign up for GitHub

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

Jump to bottom
Merged
bbakerman merged 3 commits into from
Jun 22, 2017
Merged

Tklovett builder consistency #524

bbakerman merged 3 commits into from
Jun 22, 2017

Conversation

@bbakerman
Copy link
Member

@bbakerman bbakerman commented Jun 22, 2017

From #508

I dont seem to have maintainer access upstream

git push tklovett
Counting objects: 27, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (24/24), done.
Writing objects: 100% (27/27), 5.86 KiB | 0 bytes/s, done.
Total 27 (delta 15), reused 0 (delta 0)
remote: Resolving deltas: 100% (15/15), completed with 8 local objects.
To git@github.com:tklovett/graphql-java.git
 ! [remote rejected] tklovett-builder-consistency -> tklovett-builder-consistency (permission denied)
error: failed to push some refs to 'git@github.com:tklovett/graphql-java.git'

Anyway I have this branch with the merge conflicts fixed up

tlovett-rmn and others added 3 commits June 20, 2017 15:24
@tlovett-rmn
Use chaining for all Builder parameters
f66494b
@bbakerman
Merge branch 'builder-consistency' of https://github.com/tklovett/gra…
bdaedc2 
…phql-java into tklovett-builder-consistency

# Conflicts:
#	src/main/java/graphql/execution/Execution.java
@bbakerman
Fixed return statements
277fda1 
Merge branch 'builder-consistency' of https://github.com/tklovett/graphql-java into tklovett-builder-consistency

# Conflicts:
#	src/main/java/graphql/execution/Execution.java
@bbakerman bbakerman mentioned this pull request Jun 22, 2017
Closed
@bbakerman bbakerman requested a review from andimarek June 22, 2017 23:21
@bbakerman bbakerman merged commit fe422ea into graphql-java:master Jun 22, 2017
@tklovett
Copy link
Contributor

tklovett commented Jun 23, 2017

Thanks
1

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

Reviewers

@andimarek andimarek Awaiting requested review from andimarek

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bbakerman @tklovett @tlovett-rmn