baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #759 from containous/fix-mapstructure-slice

Browse source 
Fix mapstructure issue with anonymous slice
This commit is contained in:
Emile Vauge 2016-10-26 15:39:45 +02:00 committed by GitHub
commit 79cbae0c73
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glide.lock generated
View file

@ -1,5 +1,5 @@
hash: 61a63d2dd37e5a9bf32c83fa520f54458c3fe6b520f89b9615d8b26f5d3f317f hash: 45d9abd00276bba5aaeb92cd5f2464e404bba3cf90f37aa538d4866041626327
updated: 2016-10-24T15:09:49.3944218+02:00 updated: 2016-10-26T14:26:07.740582437+02:00
imports: imports:
- name: github.com/abbot/go-http-auth - name: github.com/abbot/go-http-auth
version: cb4372376e1e00e9f6ab9ec142e029302c9e7140 version: cb4372376e1e00e9f6ab9ec142e029302c9e7140
@ -225,7 +225,7 @@ imports:
- name: github.com/miekg/dns - name: github.com/miekg/dns
version: 5d001d020961ae1c184f9f8152fdc73810481677 version: 5d001d020961ae1c184f9f8152fdc73810481677
- name: github.com/mitchellh/mapstructure - name: github.com/mitchellh/mapstructure
version: ca63d7c062ee3c9f34db231e352b60012b4fd0c1 version: f3009df150dadf309fdee4a54ed65c124afad715
- name: github.com/moul/http2curl - name: github.com/moul/http2curl
version: b1479103caacaa39319f75e7f57fc545287fca0d version: b1479103caacaa39319f75e7f57fc545287fca0d
- name: github.com/NYTimes/gziphandler - name: github.com/NYTimes/gziphandler

2
glide.yaml
View file

@ -102,6 +102,8 @@ import:
- package: github.com/docker/leadership - package: github.com/docker/leadership
- package: github.com/satori/go.uuid - package: github.com/satori/go.uuid
version: ^1.1.0 version: ^1.1.0
- package: github.com/mitchellh/mapstructure
version: f3009df150dadf309fdee4a54ed65c124afad715
- package: github.com/coreos/go-systemd - package: github.com/coreos/go-systemd
version: v12 version: v12
subpackages: subpackages:

4
types/types.go
View file

@ -216,12 +216,12 @@ type Users []string
// Basic HTTP basic authentication // Basic HTTP basic authentication
type Basic struct { type Basic struct {
Users Users `mapstructure:","`
} }
// Digest HTTP authentication // Digest HTTP authentication
type Digest struct { type Digest struct {
Users Users `mapstructure:","`
} }
// CanonicalDomain returns a lower case domain with trim space // CanonicalDomain returns a lower case domain with trim space