Add parent aggregation #1616
Add parent aggregation #1616
Conversation
env/elasticsearch/Dockerfile
Outdated
| @@ -1,5 +1,5 @@ | |||
| #https://www.docker.elastic.co/ | |||
| FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.2 | |||
| FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1 | |||
There was a problem hiding this comment.
Could you open a separate PR with this change to make sure it does not have any other affects? With this change, we normally also update the README and all the places where we mention what we test with (just search for 6.5.2)
There was a problem hiding this comment.
Thanks, as soon as the other one is in, could you rebase on top of it?
There was a problem hiding this comment.
Sure, I will do it!
| ### Improvements | ||
| * Added `native_function_invocation` CS rule [#1606](https://github.com/ruflin/Elastica/pull/1606) | ||
| * Elasticsearch test version changed from 6.5.2 to 6.6.1 [#1620](https://github.com/ruflin/Elastica/pull/1620) |
There was a problem hiding this comment.
Seems like a bit more changes in the changelog then there should be?
There was a problem hiding this comment.
Sorry this is my first PR, I'm still discovering how to use git in such way...
I did a rebase of my parent-agg branch onto your origin/master branch but I don't really understand what happened after (my IDE added an empty merge, I don't know why, but I definitely did a rebase). When I try to rebase again, it says that my branch is up-to-date with your master, and for me it seems that way, I suppose I don't understand well what this rebase should have done.
Can you explain me what's wrong and how to fix it please? Really sorry for the inconvenience.
There was a problem hiding this comment.
One thing that potentially might have happened, is that your master is not up-to-date. Can you go to your master and pull the most recent version? You can use git log to see which commit your master is on. Today it should be d0433d6 (the id or the prefix of it you should see in your git log output on the top).
There was a problem hiding this comment.
Actually, the first time I tried to rebase directly on your master, not mine (which was not sync with yours).
I tried to redo the operation with my master, after setting it in sync with yours.
It looks good to me this time, I hope it is :-)
README.md
Outdated
| @@ -17,7 +17,7 @@ All library issues should go to the [issue tracker from github](https://github.c | |||
|
|
|||
| Compatibility | |||
| ------------- | |||
| This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.5.2. | |||
| This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.6.1. | |||
There was a problem hiding this comment.
That should go away with a rebase? Also below?
|
PR looks good, but there is a failing test. Unfortunately can't really see how it's related to this PR especially as only 1 PHP version failed: https://travis-ci.org/ruflin/Elastica/jobs/512448687 |
|
I restarted the test to see if it's just flaky. |
|
@SosthenG Thanks for the contribution. |
I also updated the docker elasticsearch version to 6.6.1 to be able to launch the test.