Merge branch markberger/ticket-2008
authorBrian Warner <warner@lothar.com>
Wed, 3 Sep 2014 01:50:48 +0000 (18:50 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 3 Sep 2014 01:50:48 +0000 (18:50 -0700)
This changes test_upload.py to delete-all-shares more gently, leaving
the 'incoming' directory in place, which should help the rest of the
test pass.

Closes tahoe-lafs/tahoe-lafs#50 (github PR)
Closes ticket:2008 (trac)


Trivial merge