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)
commit3cfbe1cfc0c0c845e4cef66e5e69fd0b445054cf
treef761f3a5e1f066dcbdfa0c11309a1d334e5151cb
parent83068a90c809a09e9f08f7a60beafe13725e564a
parent954229231d3931e4bd3531e63ee934aa391184c7
Merge branch markberger/ticket-2008

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)