Skip to content

Conversation

@breskeby
Copy link
Contributor

This fixes #79092.

A follow up on tighten our licenseheader checks was raised at #79235 and will be
addressed in a separate PR

This fixes elastic#79092.

A follow up on tighten our licenseheader checks was raised at elastic#79235 and will be
addressed in a separate PR
@breskeby breskeby self-assigned this Oct 15, 2021
@breskeby breskeby added :Delivery/Build Build or test infrastructure >enhancement Team:Delivery Meta label for Delivery team v7.16.0 v8.0.0 labels Oct 15, 2021
@breskeby breskeby marked this pull request as ready for review October 15, 2021 12:19
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@breskeby breskeby merged commit b1c3f55 into elastic:master Oct 18, 2021
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
7.x Commit could not be cherrypicked due to conflicts

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

breskeby added a commit that referenced this pull request Oct 18, 2021
This fixes #79092.

A follow up on tighten our licenseheader checks was raised at #79235 and will be
addressed in a separate PR
# Conflicts:
#	x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongClientYamlTestSuiteIT.java
elasticsearchmachine pushed a commit that referenced this pull request Oct 18, 2021
This fixes #79092.

A follow up on tighten our licenseheader checks was raised at #79235 and will be
addressed in a separate PR
# Conflicts:
#	x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongClientYamlTestSuiteIT.java
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Oct 18, 2021
* upstream/master:
  Changing test keytab to use aes256-cts-hmac-sha1-96 instead of des3-cbc-sha1-kd (elastic#78703)
  Add support for configuring HNSW parameters (elastic#79193)
  Deprecate resolution loss on date field (elastic#78921)
  Add Optional to Configure bind user (elastic#78303)
  Adapt BWC after backporting elastic#78765 (elastic#79350)
  [DOCS] Add deprecation notice for reset password tool (elastic#78793)
  added test for flattened type in top_metrics.yml (elastic#78960)
  [DOCS] Fixes indentation issue in GET trained models API docs. (elastic#79347)
  Fix parsing of PBES2 encrypted PKCS#8 keys (elastic#78904)
  Mute testReindex (elastic#79343)
  Node level can match action (elastic#78765)
  Fix duplicate license header in source files (elastic#79236)
  AllowAll for indicesAccessControl (elastic#78498)
  Better logging and internal user handling for operator privileges (elastic#79331)

# Conflicts:
#	server/src/main/java/org/elasticsearch/index/mapper/MappingParser.java
@breskeby breskeby deleted the fix-duplicate-headers branch December 10, 2024 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Delivery/Build Build or test infrastructure >enhancement Team:Delivery Meta label for Delivery team v7.16.0 v8.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicated license headers

5 participants