@@ -60,7 +60,7 @@ clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://gith

 clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git

 clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3

 clone git github.com/docker/go-connections fa2850ff103453a9ad190da0df0af134f0314b3d

-clone git github.com/docker/engine-api c977588a28fa81fbbb06c295e936853cef37cf27

+clone git github.com/docker/engine-api ebb728a1346926edc2ad9418f9b6045901810b20

 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837

 clone git github.com/imdario/mergo 0.2.1

@@ -13,8 +13,8 @@ import (

 func (cli *Client) SwarmUpdate(ctx context.Context, version swarm.Version, swarm swarm.Spec, flags swarm.UpdateFlags) error {

 	query := url.Values{}

 	query.Set("version", strconv.FormatUint(version.Index, 10))

-	query.Set("rotate_worker_token", fmt.Sprintf("%v", flags.RotateWorkerToken))

-	query.Set("rotate_manager_token", fmt.Sprintf("%v", flags.RotateManagerToken))

+	query.Set("rotateWorkerToken", fmt.Sprintf("%v", flags.RotateWorkerToken))

+	query.Set("rotateManagerToken", fmt.Sprintf("%v", flags.RotateManagerToken))

 	resp, err := cli.post(ctx, "/swarm/update", query, swarm, nil)

 	ensureReaderClosed(resp)

 	return err

@@ -3,14 +3,16 @@ package events

 const (

 	// ContainerEventType is the event type that containers generate

 	ContainerEventType = "container"

+	// DaemonEventType is the event type that daemon generate

+	DaemonEventType = "daemon"

 	// ImageEventType is the event type that images generate

 	ImageEventType = "image"

-	// VolumeEventType is the event type that volumes generate

-	VolumeEventType = "volume"

 	// NetworkEventType is the event type that networks generate

 	NetworkEventType = "network"

-	// DaemonEventType is the event type that daemon generate

-	DaemonEventType = "daemon"

+	// PluginEventType is the event type that plugins generate

+	PluginEventType = "plugin"

+	// VolumeEventType is the event type that volumes generate

+	VolumeEventType = "volume"

 )

 // Actor describes something that generates events,

@@ -282,7 +282,7 @@ type ExecStartCheck struct {

 type HealthcheckResult struct {

 	Start    time.Time // Start is the time this check started

 	End      time.Time // End is the time this check ended

-	ExitCode int       // ExitCode meanings: 0=healthy, 1=unhealthy, 2=starting, else=error running probe

+	ExitCode int       // ExitCode meanings: 0=healthy, 1=unhealthy, 2=reserved (considered unhealthy), else=error running probe

 	Output   string    // Output from last check

 }