David Pilato a9e93a0da4 Merge branch 'master' into pr/15724-gce-network-host-master ...

# Conflicts:
#	plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java
#	plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java
#	plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java

2016-06-30 11:53:09 +02:00

..

licenses

update shas for httpclient and httpcore

2016-05-20 14:10:55 +02:00

src

Merge branch 'master' into pr/15724-gce-network-host-master

2016-06-30 11:53:09 +02:00

build.gradle

Move keystore creation to gradle - this prevents committing a keystore to the source repo

2016-02-29 22:01:39 +01:00