Merge branch 'master' into 7491-go-keepclient-retry
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 9 Oct 2015 20:06:14 +0000 (16:06 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 9 Oct 2015 20:06:14 +0000 (16:06 -0400)
commit1996b03c10e45d4c1959b40333c57261a040bffb
tree2db6f10c0af0bff1140d7ead3431c0a6392b7a87
parentc4f5281d2453faf3184c367f54b29bb77ecf533b
parente55f6e9fcb652a2b1505364b34d9d48e79adaeaf
Merge branch 'master' into 7491-go-keepclient-retry

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