Merge branch '7167-keep-rsync-test-setup' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Thu, 8 Oct 2015 20:22:45 +0000 (16:22 -0400)
committerradhika <radhika@curoverse.com>
Thu, 8 Oct 2015 20:22:45 +0000 (16:22 -0400)
commit84de88800275db7046e3c784ff73d4af1a6f03b1
treec163afcaa6d6df8b137785e422fcb1d8dc5bc493
parentac2426ef6ba7c2c722da0f7b0add2c5040529bd3
parente531e2bb20a6ad0acaef4c7a19fb7625f94ccc0c
Merge branch '7167-keep-rsync-test-setup' into 7167-keep-rsync

Conflicts:
tools/keep-rsync/keep-rsync_test.go
tools/keep-rsync/keep-rsync.go
tools/keep-rsync/keep-rsync_test.go