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

CHANGELOG.md

@@ -60,6 +60,7 @@ BUG FIXES:
   * client: Prevent race when persisting state file [GH-1682]
   * client: Retry recoverable errors when starting a driver [GH-1891]
   * client: Fix old services not getting removed from consul on update [GH-1668]
+  * client: Preserve permissions of nested directories while chrooting [GH-1960]
   * client: Folder permissions are dropped even when not running as root [GH-1888]
   * client: Artifact download failures will be retried before failing tasks
     [GH-1558]

api/agent_test.go

@@ -103,10 +103,10 @@ func TestAgent_Members(t *testing.T) {
 	}
 
 	// Check that we got the expected result
-	if n := len(mem); n != 1 {
+	if n := len(mem.Members); n != 1 {
 		t.Fatalf("expected 1 member, got: %d", n)
 	}
-	if m := mem[0]; m.Name == "" || m.Addr == "" || m.Port == 0 {
+	if m := mem.Members[0]; m.Name == "" || m.Addr == "" || m.Port == 0 {
 		t.Fatalf("bad member: %#v", m)
 	}
 }