From a8340bab14e8a0da771458391ab6a878d9f856aa Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Tue, 8 Nov 2016 15:42:32 -0800 Subject: [PATCH 1/2] Updated Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de8a19248..1c94007a7 100644 --- a/CHANGELOG.md +++ b/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] From 47a20f8ec165ff07f0ae886f85f6c8b2b94e31fe Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Tue, 8 Nov 2016 15:48:47 -0800 Subject: [PATCH 2/2] Fixed a test --- api/agent_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/agent_test.go b/api/agent_test.go index 0e764dbd2..70a772f27 100644 --- a/api/agent_test.go +++ b/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) } }