From bac3376278bfd8125879ca86e8eb26df85858d4c Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Sun, 22 Jul 2018 20:14:05 -0700
Subject: Updating dependencies (#9139)

---
 vendor/gopkg.in/olivere/elastic.v5/.travis.yml                |  1 +
 vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS               |  2 ++
 vendor/gopkg.in/olivere/elastic.v5/client.go                  |  4 ++--
 .../gopkg.in/olivere/elastic.v5/search_queries_has_parent.go  | 11 +++++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'vendor/gopkg.in')

diff --git a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
index 345d1bf86..d88c9c642 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
+++ b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
@@ -10,6 +10,7 @@ matrix:
 services:
   - docker
 before_install:
+  - go get github.com/fortytw2/leaktest
   - sudo sysctl -w vm.max_map_count=262144
   - docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.6.9 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null &
   - sleep 30
diff --git a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
index 94fd0ecd2..55fe6d95a 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
+++ b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
@@ -86,6 +86,7 @@ Kenta SUZUKI [@suzuken](https://github.com/suzuken)
 Kevin Mulvey [@kmulvey](https://github.com/kmulvey)
 Kyle Brandt [@kylebrandt](https://github.com/kylebrandt)
 Leandro Piccilli [@lpic10](https://github.com/lpic10)
+Lee [@leezhm](https://github.com/leezhm)
 M. Zulfa Achsani [@misterciput](https://github.com/misterciput)
 Maciej Lisiewski [@c2h5oh](https://github.com/c2h5oh)
 Mara Kim [@autochthe](https://github.com/autochthe)
@@ -109,6 +110,7 @@ Nicolae Vartolomei [@nvartolomei](https://github.com/nvartolomei)
 Orne Brocaar [@brocaar](https://github.com/brocaar)
 Paul [@eyeamera](https://github.com/eyeamera)
 Pete C [@peteclark-ft](https://github.com/peteclark-ft)
+Paolo [@ppiccolo](https://github.com/ppiccolo)
 Radoslaw Wesolowski [r--w](https://github.com/r--w)
 rchicoli [@rchicoli](https://github.com/rchicoli)
 Roman Colohanin [@zuzmic](https://github.com/zuzmic)
diff --git a/vendor/gopkg.in/olivere/elastic.v5/client.go b/vendor/gopkg.in/olivere/elastic.v5/client.go
index 3d7478422..2e190a579 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/client.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/client.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	// Version is the current version of Elastic.
-	Version = "5.0.69"
+	Version = "5.0.70"
 
 	// DefaultURL is the default endpoint of Elasticsearch on the local machine.
 	// It is used e.g. when initializing a new Client without a specific URL.
@@ -1307,7 +1307,7 @@ func (c *Client) PerformRequestWithOptions(ctx context.Context, opt PerformReque
 		}
 		if ue, ok := err.(*url.Error); ok {
 			// This happens e.g. on redirect errors, see https://golang.org/src/net/http/client_test.go#L329
-			if ue.Err == context.Canceled || ue.Err == context.DeadlineExceeded {
+			if ue.Err == context.Canceled || ue.Err == context.DeadlineExceeded || ue.Temporary() {
 				// Proceed, but don't mark the node as dead
 				return nil, err
 			}
diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_queries_has_parent.go b/vendor/gopkg.in/olivere/elastic.v5/search_queries_has_parent.go
index 7df110cd2..aa46b34c9 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/search_queries_has_parent.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/search_queries_has_parent.go
@@ -19,6 +19,7 @@ type HasParentQuery struct {
 	score      *bool
 	queryName  string
 	innerHit   *InnerHit
+	ignoreUnmapped *bool
 }
 
 // NewHasParentQuery creates and initializes a new has_parent query.
@@ -55,6 +56,13 @@ func (q *HasParentQuery) InnerHit(innerHit *InnerHit) *HasParentQuery {
 	return q
 }
 
+// IgnoreUnmapped specifies whether unmapped types should be ignored.
+// If set to false, the query failes when an unmapped type is found.
+func (q *HasParentQuery) IgnoreUnmapped(ignore bool) *HasParentQuery {
+	q.ignoreUnmapped = &ignore
+	return q
+}
+
 // Source returns JSON for the function score query.
 func (q *HasParentQuery) Source() (interface{}, error) {
 	// {
@@ -93,5 +101,8 @@ func (q *HasParentQuery) Source() (interface{}, error) {
 		}
 		query["inner_hits"] = src
 	}
+	if q.ignoreUnmapped != nil {
+		query["ignore_unmapped"] = *q.ignoreUnmapped
+	}
 	return source, nil
 }
-- 
cgit v1.2.3-1-g7c22