4875: Merge branch 'master' into 4875-keepclient-test-race
authorTom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:29:17 +0000 (16:29 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:29:17 +0000 (16:29 -0500)
commit68c8b2056d6c72f0229cf29f999a8e0a1e4231f9
treeeb4422676dbfe1cf4f5d2a8e03655765d4d56161
parent14421881c1962fdfba49dc004cfc69c0637fe454
parent420d88e40bc5c2d12fe53a5f9f25ec19d80de797
4875: Merge branch 'master' into 4875-keepclient-test-race

Conflicts:
sdk/go/keepclient/keepclient_test.go
sdk/go/keepclient/keepclient_test.go