MM-10934 Update server dependencies. (#8981)

* Changing throttled import path.

* Upgrading dependencies.

4 files changed, 9 insertions, 6 deletions

diff --git a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
index 9251fb7cd..345d1bf86 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
+++ b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml
@@ -2,9 +2,8 @@ sudo: required
 language: go
 script: go test -race -v . ./config
 go:
-  - "1.9.x"
-  - "1.10.x"
-  # - tip
+  - 1.x
+  - tip
 matrix:
   allow_failures:
     - go: tip
diff --git a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
index 7d7c3832f..94fd0ecd2 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
+++ b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS
@@ -41,6 +41,7 @@ Corey Scott [@corsc](https://github.com/corsc)
 Daniel Barrett [@shendaras](https://github.com/shendaras)
 Daniel Heckrath [@DanielHeckrath](https://github.com/DanielHeckrath)
 Daniel Imfeld [@dimfeld](https://github.com/dimfeld)
+David Emanuel Buchmann [@wuurrd](https://github.com/wuurrd)
 Dwayne Schultz [@myshkin5](https://github.com/myshkin5)
 Ellison Leão [@ellisonleao](https://github.com/ellisonleao)
 Erwin [@eticzon](https://github.com/eticzon)
@@ -100,6 +101,7 @@ naimulhaider [@naimulhaider](https://github.com/naimulhaider)
 Naoya Yoshizawa [@azihsoyn](https://github.com/azihsoyn)
 navins [@ishare](https://github.com/ishare)
 Naoya Tsutsumi [@tutuming](https://github.com/tutuming)
+NeoCN [@NeoCN](https://github.com/NeoCN)
 Nicholas Wolff [@nwolff](https://github.com/nwolff)
 Nick K [@utrack](https://github.com/utrack)
 Nick Whyte [@nickw444](https://github.com/nickw444)
@@ -108,6 +110,7 @@ Orne Brocaar [@brocaar](https://github.com/brocaar)
 Paul [@eyeamera](https://github.com/eyeamera)
 Pete C [@peteclark-ft](https://github.com/peteclark-ft)
 Radoslaw Wesolowski [r--w](https://github.com/r--w)
+rchicoli [@rchicoli](https://github.com/rchicoli)
 Roman Colohanin [@zuzmic](https://github.com/zuzmic)
 Ryan Schmukler [@rschmukler](https://github.com/rschmukler)
 Ryan Wynn [@rwynn](https://github.com/rwynn)
diff --git a/vendor/gopkg.in/olivere/elastic.v5/bulk.go b/vendor/gopkg.in/olivere/elastic.v5/bulk.go
index 452f5c394..7e2d3c53f 100644
--- a/vendor/gopkg.in/olivere/elastic.v5/bulk.go
+++ b/vendor/gopkg.in/olivere/elastic.v5/bulk.go
@@ -52,7 +52,8 @@ func NewBulkService(client *Client) *BulkService {
 	return builder
 }
 
-func (s *BulkService) reset() {
+// Reset cleans up the request queue
+func (s *BulkService) Reset() {
 	s.requests = make([]BulkableRequest, 0)
 	s.sizeInBytes = 0
 	s.sizeInBytesCursor = 0
@@ -262,7 +263,7 @@ func (s *BulkService) Do(ctx context.Context) (*BulkResponse, error) {
 	}
 
 	// Reset so the request can be reused
-	s.reset()
+	s.Reset()
 
 	return ret, nil
 }
diff --git a/vendor/gopkg.in/olivere/elastic.v5/client.go b/vendor/gopkg.in/olivere/elastic.v5/client.go
index 95debc4d9..3d7478422 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.68"
+	Version = "5.0.69"
 
 	// 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.