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

Author: dadgar

README.md

@@ -1,4 +1,4 @@
-Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) [![Build status](https://ci.appveyor.com/api/projects/status/i748vuqet037ojo3?svg=true)](https://ci.appveyor.com/project/hashicorp/nomad) [![Join the chat at https://gitter.im/hashicorp-nomad/Lobby](https://badges.gitter.im/hashicorp-nomad/Lobby.svg)](https://gitter.im/hashicorp-nomad/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) [![Join the chat at https://gitter.im/hashicorp-nomad/Lobby](https://badges.gitter.im/hashicorp-nomad/Lobby.svg)](https://gitter.im/hashicorp-nomad/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 =========
 -	Website: https://www.nomadproject.io
 -	Mailing list: [Google Groups](https://groups.google.com/group/nomad-tool)

nomad/deploymentwatcher/deployment_watcher.go

@@ -295,7 +295,7 @@ func (w *deploymentWatcher) watch() {
 		// something to change past what the scheduler has evaluated.
 		allocResp, err := w.getAllocs(allocIndex)
 		if err != nil {
-			if err == context.Canceled {
+			if err == context.Canceled || w.ctx.Err() == context.Canceled {
 				return
 			}
 
@@ -307,7 +307,7 @@ func (w *deploymentWatcher) watch() {
 		// Get the latest evaluation index
 		latestEval, err := w.latestEvalIndex()
 		if err != nil {
-			if err == context.Canceled {
+			if err == context.Canceled || w.ctx.Err() == context.Canceled {
 				return
 			}
 

nomad/deploymentwatcher/deployments_watcher.go

@@ -170,7 +170,7 @@ func (w *Watcher) watchDeployments() {
 		// Block getting all deployments using the last deployment index.
 		resp, err := w.getDeploys(dindex)
 		if err != nil {
-			if err == context.Canceled {
+			if err == context.Canceled || w.ctx.Err() == context.Canceled {
 				return
 			}