Merge branch 'v1.5' into master

provider/mesos/config.go

@@ -81,7 +81,7 @@ func taskRecords(st state.State) []state.Task {
 		for _, task := range f.Tasks {
 			for _, slave := range st.Slaves {
 				if task.SlaveID == slave.ID {
-					task.SlaveIP = slave.Hostname
+					task.SlaveIP = slave.PID.Host
 				}
 			}
 

provider/mesos/config_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/containous/traefik/provider/label"
 	"github.com/containous/traefik/types"
+	"github.com/mesos/mesos-go/upid"
 	"github.com/mesosphere/mesos-dns/records/state"
 	"github.com/stretchr/testify/assert"
 )
@@ -262,6 +263,9 @@ func TestTaskRecords(t *testing.T) {
 		ID:       "s_id",
 		Hostname: "127.0.0.1",
 	}
+	slave.PID.UPID = &upid.UPID{}
+	slave.PID.Host = slave.Hostname
+
 	var taskState = state.State{
 		Slaves:     []state.Slave{slave},
 		Frameworks: []state.Framework{framework},