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
..
aggregations	Fix typo in docs	2015-07-31 19:11:04 -04:00
analysis	Docs: Use "js" instead of "json" and "sh" instead of "shell" for source highlighting	2015-07-14 18:14:09 +02:00
cat	Add _cat/nodeattrs API	2015-07-29 16:11:18 -04:00
cluster	Update OS stats	2015-07-08 17:48:10 +02:00
docs	Remove delete-by-query core docs	2015-08-01 05:14:46 -04:00
images	Aggregations: add serial differencing pipeline aggregation	2015-07-10 18:22:01 -04:00
index-modules	Docs: Refactored the mapping meta-fields docs	2015-07-20 01:26:27 +02:00
indices	Left over from the `query_cache` to `request_cache` rename.	2015-07-27 13:28:15 +02:00
mapping	Merge branch 'master' into fix/12329	2015-07-21 00:29:34 -07:00
migration	Merge branch 'master' into feature/query-refactoring	2015-08-03 11:19:04 +02:00
modules	Fixed official api name in docs	2015-08-02 12:39:40 +09:00
query-dsl	Merge pull request #12357 from rjernst/fix/12317	2015-07-21 00:27:27 -07:00
search	Remove delete-by-query core docs	2015-08-01 05:14:46 -04:00
setup	Don't access pgp.mit.edu over HTTP	2015-08-03 17:52:39 -06:00
testing	Replace references to ImmutableSettings with Settings	2015-06-24 14:54:53 +09:00
aggregations.asciidoc	Scripting: Unify script and template requests across codebase	2015-05-29 16:52:04 +01:00
analysis.asciidoc	Add more anchor links to documentation	2013-09-30 13:13:16 -06:00
api-conventions.asciidoc	Added date math support in index names	2015-07-29 17:33:55 +02:00
cat.asciidoc	Add _cat/nodeattrs API	2015-07-29 16:11:18 -04:00
cluster.asciidoc	Remove `_shutdown` API	2015-04-27 17:19:36 +02:00
docs.asciidoc	Remove delete-by-query core docs	2015-08-01 05:14:46 -04:00
getting-started.asciidoc	Remove delete-by-query core docs	2015-08-01 05:14:46 -04:00
glossary.asciidoc	…
index-modules.asciidoc	Docs: Updated the source field docs to remove deprecation of includes/excludes	2015-07-10 15:52:30 +02:00
index.asciidoc	Docs: Added stub entries for pages deleted from 1.x	2015-05-24 17:57:34 +02:00
indices.asciidoc	Docs: Incorrect file name for shard stores	2015-07-18 12:08:46 +02:00
mapping.asciidoc	Docs: Refactored modules and index modules sections	2015-06-22 23:49:45 +02:00
modules.asciidoc	Docs: Refactored modules and index modules sections	2015-06-22 23:49:45 +02:00
query-dsl.asciidoc	Docs: Reorganised the Query DSL docs into families and explaing query vs filter context	2015-06-04 01:59:37 +02:00
redirects.asciidoc	Rename caches.	2015-06-29 10:15:27 +02:00
search.asciidoc	[Docs] Fix minor spelling errors	2015-05-25 19:56:43 +02:00
setup.asciidoc	Docs: Added stub entries for pages deleted from 1.x	2015-05-24 17:57:34 +02:00
testing.asciidoc	[DOCS] Test framework documentation	2013-12-02 18:01:45 +01:00