Skip to content

Conversation

@robin13
Copy link
Contributor

@robin13 robin13 commented Jun 28, 2017

Make sentence clearer - added 'where'

Copy link
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

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

Thanks, I will merge this to master and 5.x/5.5

@cbuescher cbuescher merged commit 1900d9c into elastic:master Jun 28, 2017
cbuescher pushed a commit that referenced this pull request Jun 28, 2017
cbuescher pushed a commit that referenced this pull request Jun 28, 2017
jasontedor added a commit to ywelsch/elasticsearch that referenced this pull request Jun 28, 2017
* master:
  Do not swallow exception when relocating
  Docs: Fix typo for request cache (elastic#25444)
  Remove implicit 32-bit support
  [DOCS] reworded to prevent code span rendering glitch (elastic#25442)
  Disallow multiple concurrent recovery attempts for same target shard (elastic#25428)
  Update global checkpoint when increasing primary term on replica (elastic#25422)
  Add backwards compatibility indices for 5.4.3
  Add version 5.4.3 after release
  Update MSI installer images (elastic#25414)
  Add missing newline at end of SetsTests.java
  Rename handoff primary context transport handler
  correct expected thrown exception in mappingMetaData to ElasticsearchParseException (elastic#25410)
  test: Make many percolator integration tests real integration tests
  [DOCS] Update docs to use shared attribute file (elastic#25403)
  Add Javadocs and tests for set difference methods
  Tests: Add parsing test for AggregationsTests (elastic#25396)
  test: get upgrade status for all indices
  Mute SignificantTermsAggregatorTests#testSignificance()
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Jun 28, 2017
…cal-checkpoint

* enhance/single-updateshardstate-method:
  Some cleanup
  Do not swallow exception when relocating
  Docs: Fix typo for request cache (elastic#25444)
  Remove implicit 32-bit support
  [DOCS] reworded to prevent code span rendering glitch (elastic#25442)
  Disallow multiple concurrent recovery attempts for same target shard (elastic#25428)
  Update global checkpoint when increasing primary term on replica (elastic#25422)
  Add backwards compatibility indices for 5.4.3
  Add version 5.4.3 after release
  Update MSI installer images (elastic#25414)
  Add missing newline at end of SetsTests.java
  fix test
  Rename handoff primary context transport handler
  Provide single IndexShard method to update state on incoming cluster state
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.

3 participants