homelab/traefik
1
0
Fork 0
Code Activity

Merge v1.0.1

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-07-28 19:32:12 +02:00
commit e62cca1e7c
No known key found for this signature in database
GPG key ID: D808B4C167352E59
13 changed files with 97 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integration/etcd_test.go
View file

@ -31,7 +31,7 @@ func (s *EtcdSuite) SetUpTest(c *check.C) {
s.composeProject.Start(c)
etcd.Register()
url := s.composeProject.Container(c, "etcd").NetworkSettings.IPAddress + ":4001"
url := s.composeProject.Container(c, "etcd").NetworkSettings.IPAddress + ":2379"
kv, err := libkv.NewStore(
store.ETCD,
[]string{url},

4
integration/fixtures/etcd/simple.toml
View file

@ -8,9 +8,9 @@ logLevel = "DEBUG"
[etcd]
endpoint = "{{.EtcdHost}}:4001"
endpoint = "{{.EtcdHost}}:2379"
prefix = "/traefik"
watch = true
[web]
address = ":8081"
address = ":8081"