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

[#1952] chore(librairies): Update async-http-client to v1.8.16 #878

Merged

Conversation

xael-fry
Copy link
Member

No description provided.

xael-fry added a commit that referenced this pull request May 29, 2015
[#1952] chore(librairies): Update async-http-client to v1.8.16
@xael-fry xael-fry merged commit f193e1a into playframework:1.3.x May 29, 2015
@xael-fry
Copy link
Member Author

Merged and pushed in master and 1.3.x.
Thanks.

@xael-fry xael-fry deleted the 1952_updateAsyncHttpTpv1.8.16 branch May 29, 2015 06:01
xabolcs added a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
…om old_master to master

Commit b91659a
("[playframework#878] Add OrderBy support in simplified queries") was never ported
to master.

The changes from Pull Request playframework#504 touched some parts of it,
therefore half of the OrderBy change sneaked in to the "new" master.

Fixing by removing the irrelevant OrderBy change.

In method findByToJPQL in file framework/src/play/db/jpa/JPQL.java:
- old_master merge commit has only StringBuilder related change
- master "merge" commit has this OrderBy change too

old_master merge commit: b6797a1
ported master commit: 97c54d2

Fix: 97c54d2 ("Merge pull request playframework#504 from marcelmay/lighthouse-1502-patch")
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
xabolcs added a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
…om old_master to master

Commit b91659a
("[playframework#878] Add OrderBy support in simplified queries") was never ported
to master.

The changes from Pull Request playframework#504 touched some parts of it,
therefore half of the OrderBy change sneaked in to the "new" master.

Fixing by removing the irrelevant OrderBy change.

In method findByToJPQL in file framework/src/play/db/jpa/JPQL.java:
- old_master merge commit has only StringBuilder related change
- master "merge" commit has this OrderBy change too

old_master merge commit: b6797a1
ported master commit: 97c54d2

Fix: 97c54d2 ("Merge pull request playframework#504 from marcelmay/lighthouse-1502-patch")
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Jan 4, 2021
xabolcs added a commit to xabolcs/play1 that referenced this pull request Mar 23, 2022
…om old_master to master

Commit b91659a
("[playframework#878] Add OrderBy support in simplified queries") was never ported
to master.

The changes from Pull Request playframework#504 touched some parts of it,
therefore half of the OrderBy change sneaked in to the "new" master.

Fixing by removing the irrelevant OrderBy change.

In method findByToJPQL in file framework/src/play/db/jpa/JPQL.java:
- old_master merge commit has only StringBuilder related change
- master "merge" commit has this OrderBy change too

old_master merge commit: b6797a1
ported master commit: 97c54d2

Fix: 97c54d2 ("Merge pull request playframework#504 from marcelmay/lighthouse-1502-patch")
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Mar 23, 2022
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Mar 23, 2022
xabolcs pushed a commit to xabolcs/play1 that referenced this pull request Mar 23, 2022
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.

1 participant