Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nicoo/elastic4s
base: 59ed55f3f7
...
head fork: nicoo/elastic4s
compare: c283c93249
Commits on Jan 15, 2014
@fehmicansaglam fehmicansaglam Ignore Sublime Text project files cce104b
@fehmicansaglam fehmicansaglam Add missing attributes for completion type 66d7ced
@sksamuel sksamuel Merge pull request #76 from fehmicansaglam/master
Add missing attributes for completion type
7335bef
Commits on Jan 16, 2014
@stringbean stringbean Add the ability to get aliases 9831dd1
@sksamuel sksamuel Merge pull request #78 from stringbean/get-alias-status
Add the ability to get aliases
a0909ce
@sksamuel sksamuel Bumped for release 0.90.10.0 4d442b1
@sksamuel sksamuel Bumped for release 0.90.10.0 0d64a09
Commits on Jan 18, 2014
@fehmicansaglam fehmicansaglam Fix SuggestionDsl to include the missing text field 162bcae
@sksamuel sksamuel Merge pull request #79 from fehmicansaglam/master
Fix SuggestionDsl to include the missing text field
69ace75
@sksamuel sksamuel Update README.md 48cb6fe
Commits on Jan 20, 2014
@fehmicansaglam fehmicansaglam Add support for phrase and completion suggesters c3daa12
@sksamuel sksamuel Merge pull request #80 from fehmicansaglam/master
Add support for phrase and completion suggesters
5f1614c
Commits on Jan 28, 2014
@sksamuel sksamuel updated build for 1.0.0 1a54f6d
@sksamuel sksamuel Merge branch 'master' of https://github.com/sksamuel/elastic4s 363e617
@sksamuel sksamuel Update README.md 54fce81
Commits on Jan 29, 2014
@sksamuel sksamuel Removed field query (not in RC1) 0c45fa4
@sksamuel sksamuel Updated boolean query to accept full set of options 0c437d4
@sksamuel sksamuel Updated boolean query tests e4795ba
@sksamuel sksamuel Updated search tests to remove deprecated functionality 5c1da41
@sksamuel sksamuel updated alias api for elastic 1.0ec1 728f1a9
@sksamuel sksamuel Fixed delete dsl 126fc3e
@sksamuel sksamuel Fixed more like this for EC1.0 0442cd3
@sksamuel sksamuel Fixed search DSL aeff472
@sksamuel sksamuel Fixed validate dsl 82fdee6
@sksamuel sksamuel Fixed percolate for elasticsearch 1.0.0rc1 4149149
@sksamuel sksamuel Fixed all compile errors c8f3b2b
Commits on Feb 01, 2014
@sksamuel sksamuel #82 Updated boolean query to support options on the outer block d7f7e0e
Commits on Feb 02, 2014
@fehmicansaglam fehmicansaglam Rename `ElasticSearch` to `Elasticsearch` 55143fa
@fehmicansaglam fehmicansaglam Fix percolator tests 2216f74
Commits on Feb 03, 2014
@instanceofme instanceofme Fixed inheritance of mapping.IndexOptions objects b991b98
@sksamuel sksamuel Merge pull request #85 from instanceofme/patch-1
Fixed inheritance of mapping.IndexOptions objects
f4bf59b
@fehmicansaglam fehmicansaglam Add rawQuery. Fixes #83 091fbe5
@sksamuel sksamuel Merge pull request #86 from sksamuel/feature/raw-query
Add rawQuery. Fixes #83
6a36d22
@sksamuel sksamuel Fixing tests 4783796
Commits on Feb 07, 2014
@patwhite patwhite Added Routing to Mappings to enable index routing 26c3f6d
@patwhite patwhite Tweaked placement of new classes 862f299
Commits on Feb 08, 2014
@sksamuel sksamuel Merge pull request #88 from Synata/master
Enable Routing in Mappings
a5558b0
Commits on Feb 10, 2014
@sksamuel sksamuel Updated for elasticsearch RC2 10eef19
@sksamuel sksamuel Updated readme with instructions for 1.0 snapshot df037dc
Commits on Feb 11, 2014
@fehmicansaglam fehmicansaglam Add fetchSourceContext and fields definitions to GetDsl 74a3329
@fehmicansaglam fehmicansaglam Add snapshot repository sample for sbt 3e5274c
Commits on Feb 12, 2014
@fehmicansaglam fehmicansaglam Upgrade to Elasticsearch 1.0.0 fixes #92 652987b
Commits on Feb 13, 2014
@stringbean stringbean Fix nested mapping properties
Properties of nested types should be within a properties object.
a13c11f
@stringbean stringbean Add cluster health query 0d1d5e7
@sksamuel sksamuel Merge pull request #93 from stringbean/fix-nested-mapping
Fix nested mapping properties
fc53f25
@stringbean stringbean Remove cache flags from parent/child filters
These are ignored in ES and no longer add the flags to the JSON
bd52e5e
@stringbean stringbean Add basic tests for cluster health 97984fc
@sksamuel sksamuel Merge pull request #94 from stringbean/cluster-health
Add basic cluster health request
7f4243e
@sksamuel sksamuel Merge pull request #95 from stringbean/remove-parentchild-filter-cache
Remove cache flags from parent/child filters
224f471
@sksamuel sksamuel Added DefinitionAttributeCutoffFrequency aaa1b5d
@sksamuel sksamuel #91 Marked jackson as optional e962d74
@sksamuel sksamuel Merge pull request #90 from sksamuel/feature/source-and-fields-in-get…
…-api

Add fetchSourceContext and fields definitions to GetDsl
f1b65d5
@sksamuel sksamuel #74 Opened builder for tests dcb61af
@sksamuel sksamuel Updated build.sbt for release 1.0.0.0. ba36434
Commits on Feb 14, 2014
@sksamuel sksamuel Update README.md 418087e
@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