projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f36349 e55f6e9)
Merge branch 'master' into 7167-keep-rsync-test-setup
authorradhika <radhika@curoverse.com>
Fri, 9 Oct 2015 22:00:56 +0000 (18:00 -0400)
committerradhika <radhika@curoverse.com>
Fri, 9 Oct 2015 22:00:56 +0000 (18:00 -0400)
Conflicts:
sdk/go/keepclient/perms.go
sdk/go/keepclient/perms_test.go
services/keepstore/perms.go
services/keepstore/perms_test.go

1  2 
sdk/go/keepclient/keepclient.go patch | diff1 | diff2 | blob | history
sdk/go/keepclient/support.go patch | diff1 | diff2 | blob | history

diff --cc sdk/go/keepclient/keepclient.go
Simple merge
diff --cc sdk/go/keepclient/support.go
Simple merge