Christoph Büscher bab9523c56 Merge branch 'master' into feature/query-refactoring ...

Conflicts:
	core/src/main/java/org/elasticsearch/ElasticsearchException.java

2015-09-18 12:05:03 +02:00

..

analysis-icu

Merge pull request #13611 from rjernst/spec_in_resources

2015-09-16 11:15:35 -07:00

analysis-kuromoji

Merge pull request #13611 from rjernst/spec_in_resources

2015-09-16 11:15:35 -07:00

analysis-phonetic

Merge pull request #13611 from rjernst/spec_in_resources

2015-09-16 11:15:35 -07:00

analysis-smartcn

Merge pull request #13611 from rjernst/spec_in_resources

2015-09-16 11:15:35 -07:00

analysis-stempel

Merge pull request #13611 from rjernst/spec_in_resources

2015-09-16 11:15:35 -07:00

cloud-azure

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

cloud-gce

Fix missing AccessControllerBlock in GCE code

2015-09-17 11:03:50 -04:00

delete-by-query

Merge branch 'master' into feature/query-refactoring

2015-09-18 12:05:03 +02:00

discovery-ec2

[discovery-ec2] Move integration tests to unit tests

2015-09-17 23:09:07 +02:00

discovery-multicast

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

jvm-example

Merge branch 'maven/elasticsearch-already-excluded'

2015-09-17 18:10:04 +02:00

lang-javascript

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

lang-python

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

mapper-murmur3

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

mapper-size

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

repository-s3

Merge pull request #13611 from rjernst/spec_in_resources

2015-09-16 11:15:35 -07:00

site-example

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00

pom.xml

Test: Move rest-api-spec for plugins into test resources

2015-09-16 03:04:53 -07:00