Merge pull request #373 from shaleman/dockermac

fix interop issue with docker 1.11

Author: jojimt

mgmtfn/dockplugin/ipamDriver.go

@@ -31,7 +31,7 @@ import (
 func getIpamCapability(w http.ResponseWriter, r *http.Request) {
 	logEvent("getIpamCapability")
 
-	content, err := json.Marshal(api.GetCapabilityResponse{RequiresMACAddress: true})
+	content, err := json.Marshal(api.GetCapabilityResponse{})
 	if err != nil {
 		httpError(w, "Could not generate getCapability response", err)
 		return

mgmtfn/dockplugin/netDriver.go

@@ -240,7 +240,9 @@ func createEndpoint(hostname string) func(http.ResponseWriter, *http.Request) {
 		log.Debug(ep)
 
 		epResponse := api.CreateEndpointResponse{
-			Interface: &api.EndpointInterface{},
+			Interface: &api.EndpointInterface{
+				MacAddress: mresp.EndpointConfig.MacAddress,
+			},
 		}
 
 		// Add the service information using Service plugin