Merge branch '7167-keep-rsync-test-setup' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Thu, 8 Oct 2015 15:13:41 +0000 (11:13 -0400)
committerradhika <radhika@curoverse.com>
Thu, 8 Oct 2015 15:13:41 +0000 (11:13 -0400)
commitfb9e39f948b75cbae8de76359f589a9f33ebd1ac
tree45c8fb939f1a3c28e2127c3bf5e4ba992ef0915b
parent0384dc6b233e42537dc4e16e7de7283a2ef94897
parent9cb175a358a7ac410901827d5f7de6a5aabe52bf
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