Skip to content

Conversation

@stu-elastic
Copy link
Contributor

@stu-elastic stu-elastic commented Mar 27, 2020

No description provided.

@stu-elastic stu-elastic merged commit b0de32d into elastic:master Mar 27, 2020
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Mar 30, 2020
* upstream/master: (447 commits)
  Adjust BWC version on node roles being sorted
  Deprecate node local storage setting (elastic#54374)
  Remove Unused BaseNodeRequest (elastic#54323)
  Decouple environment from DiscoveryNode (elastic#54373)
  Ensure that the output of node roles are sorted (elastic#54376)
  Do not stash environment in security (elastic#54372)
  Do not stash environment in machine learning (elastic#54371)
  Clean up how pipeline aggs check for multi-bucket (elastic#54161)
  Remove toString from Painless user tree nodes (elastic#54117)
  Docs: Use splitOnToken instead of custom function (elastic#48408)
  bwc: enable script cache in node stats (elastic#54362)
  bwc: Mute for script cache in node stats (elastic#54359)
  Test to enforce response to invalid data stream names
  Scripting: Use randomValueOtherThan in stats test (elastic#54356)
  Move transport decoding and aggregation to server (elastic#48263)
  Mute ScriptServiceTests.testContextCacheStats (elastic#54352)
  Improve checkstyle performance and readability (elastic#54308)
  Disable Gradle daemon when executing Windows packaging tests (elastic#54316)
  [Docs] Minor fix for SubmitAsyncSearchRequest.keepOnCompletion javadoc (elastic#54325)
  [DOCS] Fix typos in top metrics agg docs (elastic#54299)
  ...

Conflicts:
	server/src/main/java/org/elasticsearch/index/IndexModule.java
	server/src/main/java/org/elasticsearch/index/IndexService.java
	server/src/main/java/org/elasticsearch/indices/IndicesService.java
	server/src/test/java/org/elasticsearch/index/IndexModuleTests.java
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