Elasticsearch 1.0 #97

Merged
merged 4 commits into from Feb 21, 2014

Projects

None yet

4 participants

@nicoo
Contributor
nicoo commented Feb 14, 2014

Here is the PR for issue #45

nicoo added some commits Jan 14, 2014
@nicoo nicoo add basic support for aggregation framework. b1566b8
@nicoo nicoo add support for sub aggregations f968d0c
@nicoo nicoo upgrade to elasticsearch 1.0.0.RC1 - Fix CountDsl to reflect
elasticsearch breaking changes.
roll back SimpleQueryString changes from 0.90.x
59ed55f
@nicoo nicoo Merge remote-tracking branch 'sksamuel/master' into elasticsearch-1.0
Conflicts:
	build.sbt
	src/main/scala/com/sksamuel/elastic4s/DeleteDsl.scala
	src/main/scala/com/sksamuel/elastic4s/MoreLikeThisDsl.scala
	src/main/scala/com/sksamuel/elastic4s/queries.scala
	src/test/resources/com/sksamuel/elastic4s/search_string.json
	src/test/scala/com/sksamuel/elastic4s/SearchDslTest.scala
	src/test/scala/com/sksamuel/elastic4s/UpdateTest.scala
c283c93
@coveralls

Coverage Status

Coverage remained the same when pulling c283c93 on nicoo:elasticsearch-1.0 into 418087e on sksamuel:master.

@fehmicansaglam
Contributor

lgtm

@sksamuel sksamuel merged commit 00365ec into sksamuel:master Feb 21, 2014

1 check passed

default The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment