Skip to content

Commit

Permalink
update to ES6 beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
p365labs committed Sep 1, 2017
1 parent b42d84b commit bb568c9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file based on the
- Removed [native script](https://github.com/elastic/elasticsearch/pull/24726) [#1364](https://github.com/ruflin/Elastica/pull/1364)
- Removed old / removed script language support : javascript, python, mvel [#1364](https://github.com/ruflin/Elastica/pull/1364)
- Disable [_all](https://github.com/elastic/elasticsearch/pull/22144) by default, disallow configuring _all on 6.0+ indices [#1365](https://github.com/ruflin/Elastica/pull/1365)
- [Unfiltered nested source](https://github.com/elastic/elasticsearch/pull/26102) should keep its full path [#1366](https://github.com/ruflin/Elastica/pull/1366)

### Bugfixes
- Enforce [Content-Type requirement on the layer Rest](https://github.com/elastic/elasticsearch/pull/23146), a [PR on Elastica #1301](https://github.com/ruflin/Elastica/issues/1301) solved it (it has been implemented only in the HTTP Transport), but it was not implemented in the Guzzle Transport. [#1349](https://github.com/ruflin/Elastica/pull/1349)
Expand Down
2 changes: 1 addition & 1 deletion env/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-beta1
FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-beta2
MAINTAINER Nicolas Ruflin <spam@ruflin.com>

RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
Expand Down
2 changes: 1 addition & 1 deletion test/Elastica/Query/InnerHitsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public function testInnerHitsNested()
$innerHitsResults = $firstResult->getInnerHits();

$this->assertEquals($firstResult->getId(), 4);
$this->assertEquals($innerHitsResults['users']['hits']['hits'][0]['_source']['name'], 'Newton');
$this->assertEquals($innerHitsResults['users']['hits']['hits'][0]['_source']['users']['name'], 'Newton');
}

/**
Expand Down

0 comments on commit bb568c9

Please sign in to comment.