From: Brian Warner <warner@lothar.com>
Date: Tue, 28 Jul 2015 18:02:17 +0000 (-0700)
Subject: Merge branch 'sdmf-partial-2'
X-Git-Tag: allmydata-tahoe-1.10.2b1~8
X-Git-Url: https://git.rkrishnan.org/simplejson/components/%22file:/frontends/htmlfontify-example.html?a=commitdiff_plain;h=8f615c85511989a1abca809a411de339260a695d;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch 'sdmf-partial-2'

This cleans up the mutable-retrieve code a bit, and should fix some
corner cases where an offset/size combinations that reads the last byte
of the file (but not the first) could cause an assert to fire, making
the download hang. Should address ticket:2459 and ticket:2462.
---

8f615c85511989a1abca809a411de339260a695d