Christoph Büscher 4cceb08a0b Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java
	core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
	core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java
	core/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java
2015-08-04 10:53:19 +02:00
..
2015-07-02 13:05:11 +03:00
2015-08-01 05:14:46 -04:00
2015-02-28 17:19:55 +01:00
2015-05-05 10:38:05 +02:00

The Elasticsearch docs are in AsciiDoc format and can be built using the Elasticsearch documentation build process

See: https://github.com/elastic/docs