From: Brian Warner <warner@lothar.com>
Date: Wed, 3 Sep 2014 01:50:48 +0000 (-0700)
Subject: Merge branch markberger/ticket-2008
X-Git-Tag: allmydata-tahoe-1.10.1a1~148
X-Git-Url: https://git.rkrishnan.org/banana.xhtml?a=commitdiff_plain;h=3cfbe1cfc0c0c845e4cef66e5e69fd0b445054cf;p=tahoe-lafs%2Ftahoe-lafs.git

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)
---

3cfbe1cfc0c0c845e4cef66e5e69fd0b445054cf