Skip to content

Conversation

@salvatore-campagna
Copy link
Contributor

@salvatore-campagna salvatore-campagna commented Mar 31, 2022

Backport PR #85467 added two tests:

  • Multi-value date histogram
  • Multi-value date histogram docvalues only

as a result of a mistake while doing a conflict resolution.

With this PR I will remove them temporarily from master,
backport the fix to 7.17.3 and later make another PR to
master to add them back.

This is a fix for #85509.

Backport PR elastic#85467 added two tests:
* Multi-value date histogram
* Multi-value date histogram docvalues only
as a result of a mistake while doing a conflict resolution.

With this PR I will remove them temporarily from master, backport
the fix to 7.17.3 and later make another PR to master to add them
back.

This is a fix for elastic#85509.
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-analytics-geo (Team:Analytics)

@elasticsearchmachine
Copy link
Collaborator

Hi @salvatore-campagna, I've created a changelog YAML for you.

Copy link
Member

@martijnvg martijnvg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@salvatore-campagna salvatore-campagna merged commit b4ff756 into elastic:master Mar 31, 2022
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
7.17 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 85534

salvatore-campagna added a commit to salvatore-campagna/elasticsearch that referenced this pull request Mar 31, 2022
Backport PR elastic#85467 added two tests:
* Multi-value date histogram
* Multi-value date histogram docvalues only
as a result of a mistake while doing a conflict resolution.

With this PR I will remove them temporarily from master, backport
the fix to 7.17.3 and later make another PR to master to add them
back.

This is a fix for elastic#85509.

(cherry picked from commit b4ff756)

# Conflicts:
#	rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml
@salvatore-campagna
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
7.17

Questions ?

Please refer to the Backport tool documentation

salvatore-campagna added a commit to salvatore-campagna/elasticsearch that referenced this pull request Mar 31, 2022
salvatore-campagna added a commit that referenced this pull request Mar 31, 2022
Backport PR #85467 added two tests:
* Multi-value date histogram
* Multi-value date histogram docvalues only
as a result of a mistake while doing a conflict resolution.

With this PR I will remove them temporarily from master, backport
the fix to 7.17.3 and later make another PR to master to add them
back.

This is a fix for #85509.

(cherry picked from commit b4ff756)

# Conflicts:
#	rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml
salvatore-campagna added a commit that referenced this pull request Apr 1, 2022
These tests should be successful after #85540 is merged as a result
of tests being removed from 7.17.
@pugnascotia pugnascotia added >test Issues or PRs that are addressing/adding tests and removed >bug labels Apr 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Analytics/Aggregations Aggregations Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) >test Issues or PRs that are addressing/adding tests v7.17.3 v8.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants