javanna d7187238a2 Merge branch 'master' into feature/query-refactoring ... Conflicts: core/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java		2015-07-02 11:46:47 +02:00
..
index.asciidoc	More Like This: removal of the MLT API	2015-05-06 18:11:11 +02:00
migrate_1_0.asciidoc	Docs: Fixed typos	2015-05-05 10:38:05 +02:00
migrate_1_4.asciidoc	Query DSL: Remove filter parsers.	2015-05-07 20:14:34 +02:00
migrate_1_6.asciidoc	parent/child: Deprecated the `top_children` in favour of the `has_child` query.	2015-05-07 09:27:54 +02:00
migrate_2_0.asciidoc	percolator: `getTime` -> `time`	2015-06-30 18:44:58 +02:00
migrate_query_refactoring.asciidoc	Query refactoring: unify boost and query name	2015-07-01 17:48:40 +02:00