Christoph Büscher d6738fa650 Merge branch 'master' into feature/rank-eval ...

Conflicts:
	core/src/main/java/org/elasticsearch/script/Script.java

2016-11-15 14:56:36 +01:00

..

licenses

Upgrade to lucene-6.3.0. (#21464)

2016-11-14 09:36:45 +01:00

src

Merge branch 'master' into feature/rank-eval

2016-11-15 14:56:36 +01:00

build.gradle

Update Joda Time to version 2.9.5 (#21468)

2016-11-10 17:32:46 +01:00