Christoph Büscher 39667b5793 Merge branch 'master' into feature-suggest-refactoring ...

Conflicts:
	docs/reference/migration/migrate_5_0/java.asciidoc

2016-03-16 12:06:42 +01:00

..

allocation.asciidoc

…

cat.asciidoc

…

index-apis.asciidoc

…

java.asciidoc

Merge branch 'master' into feature-suggest-refactoring

2016-03-16 12:06:42 +01:00

mapping.asciidoc

…

packaging.asciidoc

…

percolator.asciidoc

…

plugins.asciidoc

…

rest.asciidoc

…

search.asciidoc

…

settings.asciidoc

Fix typo inadvertently introduced

2016-03-15 10:05:28 -04:00