Merge branch 'master' of github.com:hashicorp/nomad

CHANGELOG.md

@@ -29,6 +29,7 @@ BUG FIXES:
   * client: Fix race condition with deriving vault tokens [GH-2275]
   * config: Fix Consul Config Merging/Copying [GH-2278]
   * config: Fix Client reserved resource merging panic [GH-2281]
+  * driver/docker: Fix Docker 1.13 on Windows [GH-2342]
   * server: Fix panic when forwarding Vault derivation requests from non-leader
     servers [GH-2267]
 

README.md

@@ -3,7 +3,9 @@ Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travi
 -	Website: https://www.nomadproject.io
 -	Mailing list: [Google Groups](https://groups.google.com/group/nomad-tool)
 
-![Nomad](https://raw.githubusercontent.com/hashicorp/nomad/master/website/source/assets/images/logo-header%402x.png?token=AAkIoLO_y1g3wgHMr3QO-559BN22rN0kks5V_2HpwA%3D%3D)
+<p align="center" style="text-align:center;">
+  <img src="https://cdn.rawgit.com/hashicorp/nomad/master/website/source/assets/images/logo-header.svg" width="500" />
+</p>
 
 Nomad is a cluster manager, designed for both long lived services and short
 lived batch processing workloads. Developers use a declarative job specification

client/driver/docker.go

@@ -753,8 +753,7 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
 
 	hostConfig := &docker.HostConfig{
 		// Convert MB to bytes. This is an absolute value.
-		Memory:     memLimit,
-		MemorySwap: memLimit, // MemorySwap is memory + swap.
+		Memory: memLimit,
 		// Convert Mhz to shares. This is a relative value.
 		CPUShares: int64(task.Resources.CPU),
 
@@ -764,6 +763,11 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
 		Binds: binds,
 	}
 
+	// Windows does not support MemorySwap #2193
+	if runtime.GOOS != "windows" {
+		hostConfig.MemorySwap = memLimit // MemorySwap is memory + swap.
+	}
+
 	if len(driverConfig.Logging) != 0 {
 		d.logger.Printf("[DEBUG] driver.docker: Using config for logging: %+v", driverConfig.Logging[0])
 		hostConfig.LogConfig = docker.LogConfig{

command/job_dispatch.go

@@ -22,7 +22,7 @@ dispatched instance can be provided via stdin by using "-" or by specifiying a
 path to a file. Metadata can be supplied by using the meta flag one or more
 times. 
 
-Upon successfully creation, the dispatched job ID will be printed and the
+Upon successful creation, the dispatched job ID will be printed and the
 triggered evaluation will be monitored. This can be disabled by supplying the
 detach flag.