glide up

glide.lock

@@ -1,10 +1,24 @@
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
 hash: c0ac205a859d78847e21d3cd63f427ffba985755c6ae84373e4a20364ba39b05
 updated: 2016-09-28T16:50:04.352639437+01:00
+=======
+<<<<<<< HEAD
+hash: b82175c1aafff6c4e98c8ac4baea3832895c9600beac445c10af4c004982ef05
+updated: 2016-09-20T16:03:26.379383173+02:00
+=======
+hash: f7ade4acdfd43efe6a0c1a1444776dd02d556e40bf122a495ca2fc226c880d0b
+updated: 2016-08-10T11:55:40.961089942-04:00
+>>>>>>> 2848e10... glide up
+>>>>>>> glide up
 imports:
 - name: github.com/abbot/go-http-auth
   version: cb4372376e1e00e9f6ab9ec142e029302c9e7140
 - name: github.com/boltdb/bolt
+<<<<<<< HEAD
   version: fff57c100f4dea1905678da7e90d92429dff2904
+=======
+  version: 94c8db596809690a3f7046fa83c7b0dda13a3222
+>>>>>>> 2848e10... glide up
 - name: github.com/BurntSushi/toml
   version: 99064174e013895bbd9b025c31100bd1d9b590ca
 - name: github.com/BurntSushi/ty
@@ -18,13 +32,34 @@ imports:
 - name: github.com/codegangsta/cli
   version: 1efa31f08b9333f1bd4882d61f9d668a70cd902e
 - name: github.com/codegangsta/negroni
+<<<<<<< HEAD
   version: 3f7ce7b928e14ff890b067e5bbbc80af73690a9c
+=======
+  version: 6edff56736fa7bd546812f149e8cdaae61e5a38f
+>>>>>>> 2848e10... glide up
 - name: github.com/containous/flaeg
   version: a731c034dda967333efce5f8d276aeff11f8ff87
 - name: github.com/containous/mux
   version: a819b77bba13f0c0cbe36e437bc2e948411b3996
 - name: github.com/containous/staert
+<<<<<<< HEAD
   version: 044bdfee6c8f5e8fb71f70d5ba1cf4cb11a94e97
+=======
+  version: 21164fe201578bea96317a87752953ea5d9dc6d1
+- name: github.com/containous/traefik
+  version: 4cd08e88f6baf56f33163077c1e226691d56bfa9
+  subpackages:
+  - acme
+  - autogen
+  - middlewares
+  - provider
+  - safe
+  - types
+  - version
+  - provider/k8s
+  - integration/utils
+  - mocks
+>>>>>>> 2848e10... glide up
 - name: github.com/coreos/etcd
   version: 1c9e0a0e33051fed6c05c141e6fcbfe5c7f2a899
   subpackages:
@@ -36,7 +71,15 @@ imports:
   subpackages:
   - spew
 - name: github.com/docker/distribution
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
   version: 99cb7c0946d2f5a38015443e515dc916295064d7
+=======
+<<<<<<< HEAD
+  version: b6e0cfbdaa1ddc3a17c95142c7bf6e42c5567370
+=======
+  version: 9000745401d186602c2ae63ffca12ed4233a968b
+>>>>>>> 2848e10... glide up
+>>>>>>> glide up
   subpackages:
   - context
   - digest
@@ -116,13 +159,21 @@ imports:
   - types/time
   - types/versions
 - name: github.com/docker/go-connections
+<<<<<<< HEAD
   version: 988efe982fdecb46f01d53465878ff1f2ff411ce
+=======
+  version: 0bad1a3951398f88ef4dd75fdb42af374430be89
+>>>>>>> 2848e10... glide up
   subpackages:
   - nat
   - sockets
   - tlsconfig
 - name: github.com/docker/go-units
+<<<<<<< HEAD
   version: f2145db703495b2e525c59662db69a7344b00bb8
+=======
+  version: eb879ae3e2b84e2a142af415b679ddeda47ec71c
+>>>>>>> 2848e10... glide up
 - name: github.com/docker/libcompose
   version: d1876c1d68527a49c0aac22a0b161acc7296b740
   subpackages:
@@ -151,13 +202,25 @@ imports:
 - name: github.com/donovanhide/eventsource
   version: fd1de70867126402be23c306e1ce32828455d85b
 - name: github.com/elazarl/go-bindata-assetfs
+<<<<<<< HEAD
   version: 9a6736ed45b44bf3835afeebb3034b57ed329f3e
+=======
+  version: e1a2a7ec64b07d04ac9ebb072404fe8b7b60de1b
+>>>>>>> 2848e10... glide up
 - name: github.com/gambol99/go-marathon
   version: a558128c87724cd7430060ef5aedf39f83937f55
 - name: github.com/go-check/check
   version: 11d3bc7aa68e238947792f30573146a3231fc0f1
 - name: github.com/gogo/protobuf
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
   version: 89f1976ff373a3e549675d2f212c10f98b6c6316
+=======
+<<<<<<< HEAD
+  version: a11c89fbb0ad4acfa8abc4a4d5f7e27c477169b1
+=======
+  version: a4cceea7a401a73fefafd1a21fedbd4694124a82
+>>>>>>> 2848e10... glide up
+>>>>>>> glide up
   subpackages:
   - proto
 - name: github.com/golang/glog
@@ -169,13 +232,29 @@ imports:
 - name: github.com/gorilla/context
   version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
 - name: github.com/hashicorp/consul
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
   version: d5b7530ec593f1ec2a8f8a7c145bcadafa88b572
+=======
+<<<<<<< HEAD
+  version: 67a03d57b5851011e5601ee6e7e3d05699548462
+=======
+  version: d6aa033793a68b509d336b3bac6ebe36ac0ef818
+>>>>>>> 2848e10... glide up
+>>>>>>> glide up
   subpackages:
   - api
 - name: github.com/hashicorp/go-cleanhttp
   version: ad28ea4487f05916463e2423a55166280e8254b5
 - name: github.com/hashicorp/serf
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
   version: b7a120a5fc494f6dd5e858f42fd0fd4022d6320f
+=======
+<<<<<<< HEAD
+  version: 555e0dcbb180ecbd03431adc28226bb3192558bc
+=======
+  version: a01569795d12afbdb3698739b614e057ee289fa0
+>>>>>>> 2848e10... glide up
+>>>>>>> glide up
   subpackages:
   - coordinate
 - name: github.com/jarcoal/httpmock
@@ -227,11 +306,23 @@ imports:
 - name: github.com/ogier/pflag
   version: 45c278ab3607870051a2ea9040bb85fcb8557481
 - name: github.com/opencontainers/runc
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
   version: d9fec4c63b089ddfc267194ecb6cda58a13f072c
+=======
+<<<<<<< HEAD
+  version: 38e0df9ec67c05e73b656c02c9222f24c1683d73
+>>>>>>> glide up
   subpackages:
   - libcontainer/user
 - name: github.com/parnurzeal/gorequest
   version: 29ced6f360a5ac3823a3675b4e29fbab336cc186
+=======
+  version: 0f764571384a3ff16c6fed25ace5b7c83f0f0379
+  subpackages:
+  - libcontainer/user
+- name: github.com/parnurzeal/gorequest
+  version: e213a02fb0082d41e66996deeaab5ae96039d913
+>>>>>>> 2848e10... glide up
 - name: github.com/pmezard/go-difflib
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
   subpackages:
@@ -245,7 +336,11 @@ imports:
 - name: github.com/Sirupsen/logrus
   version: 3ec0642a7fb6488f65b06f9040adc67e3990296a
 - name: github.com/streamrail/concurrent-map
+<<<<<<< HEAD
   version: 8bf1e9bacbf65b10c81d0f4314cf2b1ebef728b5
+=======
+  version: 430cc620f036386dacc40e603921cc607f37366b
+>>>>>>> 2848e10... glide up
 - name: github.com/stretchr/objx
   version: cbeaeb16a013161a98496fad62933b1d21786672
 - name: github.com/stretchr/testify
@@ -262,7 +357,11 @@ imports:
   subpackages:
   - codec
 - name: github.com/unrolled/render
+<<<<<<< HEAD
   version: 3f4913244021dede105b62caecfb01f0c1eebeda
+=======
+  version: 7bc415efc1b94ad17b0fc642cb50b3e2465027e7
+>>>>>>> 2848e10... glide up
 - name: github.com/vdemeester/docker-events
   version: be74d4929ec1ad118df54349fda4b0cba60f849b
 - name: github.com/vdemeester/shakers
@@ -318,7 +417,15 @@ imports:
   subpackages:
   - bson
 - name: gopkg.in/square/go-jose.v1
+<<<<<<< 3d7c44735a6fe792ad7fc9f074034a260e53bb0d
   version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d
+=======
+<<<<<<< HEAD
+  version: 139276ceb5afbf13e636c44e9382f0ca75c12ba3
+=======
+  version: a3927f83df1b1516f9e9dec71839c93e6bcf1db0
+>>>>>>> 2848e10... glide up
+>>>>>>> glide up
   subpackages:
   - cipher
   - json
@@ -348,4 +455,8 @@ testImports:
 - name: github.com/xeipuuv/gojsonreference
   version: e02fc20de94c78484cd5ffb007f8af96be030a45
 - name: github.com/xeipuuv/gojsonschema
+<<<<<<< HEAD
   version: 00f9fafb54d2244d291b86ab63d12c38bd5c3886
+=======
+  version: e4f482d0deea5bfc0522ab4582c5fdbd2edc98ad
+>>>>>>> 2848e10... glide up