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

Revert "Apply auto-flattening to subobjects: auto (#112092)" #113692

Merged
merged 4 commits into from
Sep 30, 2024

Conversation

kkrik-es
Copy link
Contributor

@kkrik-es kkrik-es commented Sep 27, 2024

@kkrik-es kkrik-es self-assigned this Sep 27, 2024
Copy link
Contributor

Documentation preview:

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 - given that that is a revert commit from command line. I do see a conflict, I'm not sure whether another commit needs to be reverted or this can be resolved manually in this PR.

# Conflicts:
#	modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/qa/DataGenerationHelper.java
#	server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
@kkrik-es kkrik-es marked this pull request as ready for review September 30, 2024 06:01
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-storage-engine (Team:StorageEngine)

@kkrik-es kkrik-es merged commit c9f378d into elastic:main Sep 30, 2024
13 of 16 checks passed
kkrik-es added a commit to kkrik-es/elasticsearch that referenced this pull request Sep 30, 2024
…elastic#113692)

* Revert "Apply auto-flattening to `subobjects: auto` (elastic#112092)"

This reverts commit fffe884

* fix DataGenerationHelper

(cherry picked from commit c9f378d)

# Conflicts:
#	server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
@kkrik-es
Copy link
Contributor Author

Backported to 8.x in #113760

elasticsearchmachine pushed a commit that referenced this pull request Sep 30, 2024
…) (#113760)

* Revert "Apply auto-flattening to `subobjects: auto` (#112092)"

This reverts commit fffe884

* fix DataGenerationHelper

(cherry picked from commit c9f378d)

# Conflicts:
#	server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
@kkrik-es kkrik-es mentioned this pull request Sep 30, 2024
elasticsearchmachine pushed a commit that referenced this pull request Sep 30, 2024
This got rolled back as part of #113692, but the change had already
rolled out to QA.
kkrik-es added a commit to kkrik-es/elasticsearch that referenced this pull request Sep 30, 2024
This got rolled back as part of elastic#113692, but the change had already
rolled out to QA.

(cherry picked from commit 9365efb)
elasticsearchmachine pushed a commit that referenced this pull request Sep 30, 2024
This got rolled back as part of #113692, but the change had already
rolled out to QA.

(cherry picked from commit 9365efb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants