From 860e5d483cd952ec833c40312a2141bb3e4ef579 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 29 May 2017 15:46:35 -0400
Subject: PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection
 timeout setting (#6410)

* Update gorp to mattermost fork and add connection timeout setting

* Add go dependency

* Rename from connection timeout to query timeout

* Properly add gorp dependency
---
 glide.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'glide.yaml')

diff --git a/glide.yaml b/glide.yaml
index caab568aa..ce34c67ca 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -11,8 +11,6 @@ import:
   - opengraph
 - package: github.com/fsnotify/fsnotify
   version: v1.4.2
-- package: github.com/go-gorp/gorp
-  version: 0c9bc0918534d133cedb439a24adc7cbe66e4a9d
 - package: github.com/go-ldap/ldap
   version: v2.5.0
 - package: github.com/go-sql-driver/mysql
@@ -83,3 +81,4 @@ import:
 - package: github.com/cpanato/html2text
 - package: gopkg.in/olivere/elastic.v5
   version: v5.0.38
+- package: github.com/mattermost/gorp
-- 
cgit v1.2.3-1-g7c22