From: "Luke-Jr" <luke@dashjr.org>
To: Bitcoin Dev <bitcoin-development@lists.sourceforge.net>
Date: Fri, 16 Aug 2013 09:39:16 +0000
User-Agent: KMail/1.13.7 (Linux/3.7.10-gentoo; KDE/4.10.5; x86_64; ; )
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart1934833.585B2BI6mb";
	protocol="application/pgp-signature"; micalg=pgp-sha256
Content-Transfer-Encoding: 7bit
Message-Id: <201308160939.29864.luke@dashjr.org>
Subject: [Bitcoin-development] LevelDB in master
Precedence: list

--nextPart1934833.585B2BI6mb
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Now-merged pull request #2702 appears to have put the master branch on an=20
unofficial Ripple fork of LevelDB, rather than merely updating us to LevelD=
B=20
1.12.0. While Vinnie did somewhat disclose this, I don't see any evidence t=
he=20
nature of this was fully understood by others. As I understood the pull=20
request, the "Ripple and Bitcoin fork" was just LevelDB with the changes we=
=20
had already made. Mike's comments on the pull request (his audit) suggest t=
hat=20
this may have been the case in an earlier revision of it. But in fact, ther=
e=20
appear to be a number of other changes included in what was finally merged =
a=20
few weeks ago. Furthermore, Ripple's fork did not do a proper git merge of=
=20
upstream, thus there is a break in git history, and, more importantly, a=20
number of upstream fixes (including some we have had reported to the Bitcoi=
n=20
issue tracker) were not included in this merge.

I've pushed three branches to https://github.com/luke-jr/leveldb :
  bitcoin-1.5   Our old/unreleased LevelDB 1.5 fork, for reference
  bitcoin       Our LevelDB 1.7 fork, included in 0.8.x
  bitcoin-up    Our LevelDB 1.7 fork, merged with upstream LevelDB 1.12

A diff from current master (Ripple LevelDB 1.12 fork) to bitcoin-up:
  https://gist.github.com/luke-jr/6248543

Thoughts?

Luke

--nextPart1934833.585B2BI6mb
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)

iQQcBAABCAAGBQJSDfNQAAoJEL0ClCQh9IifjgogAKxRG6PJ85GiHg7pdnP1NNCE
H0Zx1c6yFcGFdjSsW1lgexUJJxOweFxbUjus1B1nzsf/L/7arEmGg4GVvy5Vv0+H
hTANuyEIBInUOIC+FTc6n76ttfyz5EKRKQ6XhoZv1R9HPy6G0zCbMPkfnrkewEQ4
2u1l0xCJcrhJH5DLYoLjHUiLzKugsbSap3wHrFPeDKDai6qEC9eX0hEBWbt7xxTN
tOM+prgN53Eu+ZhOeRGQArUyb+41TD45v8bGVzIpsqnzgPw0Oc9jyuEsyyvAmfbh
T2Az3rS3OH9TJkirQa+2eIBR4bSdpd6uli8KlU0QyJMdrK0xfrkCWJV7biHr01hD
edTi0lzTxwF5PMUp+jDcAMpp/G85gNH3O2GmmGDM1Yk0VOjTmnhCmI2KcOjQ9q9t
katx5bMw6CPClDFvhYMGm4UuQ2U1d9JtR6pt0QScAP3z95jHUSh0Fqu5pObXxYvQ
B/Fqo5ZJjUY3rhBzQhi/1KcefeUlmD9qAMpiZhR8mq7DqSga3z3y3zDUEUUE9p/W
WYlbd1gXWzaHGA4eleF4R+f3PiVNC2LvGTx6N4AMaPpKscaFqIyURnFvl4LRYFPc
PH6lZTo5YXPkWoxoouJtCPmy88j5/j/xUpmw7NwrHg4ExScVwx21gH4aBsnQTFwy
n9eh0FMF3aa0vQILzJTOTS962/kuw846o1OAH9VCrBMJ2JSbyTA6L79A/86pAAC8
X3nTetg486l0X2nli5RAWLgIG83C8czZfii3waK6TPXiM9Livq2LHQe+hbWKQhhs
83/KKB/ssB24YcrITRgfohhCwdmsRqEYxbBDqi9jGjQGFebPpKWtFhiYnqj18DtZ
UVebmo+BEzMszDLTY4Kz+Xa3iUbsSnUtnalR9n+63uh3HO8tzSm7vxJ1xdzaQT7S
x0bIU09NNSxU2Px2rTo2N8CSiqvfLIVBKJ98Zgcq12BN9uubKppYcbM5HYeH1PdC
2A3dXEOL/zCD79WmZB5bGZ8ZhWIMnFFLXwnf+QHmsCQCSr5+EN42hhteEfW3VuFZ
GI5Qpi75A9uWWumXOaIJT62uhIq3VtafIlGeN2BZI4c/rrFERImtp2pG3kzuCMnA
67FcXJS5lEZJyEu1AvSZr7nX6yPJyqCEXcP9D9kFA8iK1cpOwkkGNqplH7ZrqBnh
F57AFacS6lCWuqfAViRmb8ZufF2DFT1OWOOqbEAM/xihKHwWCA0eC8mJbfzy8U1y
lMLutiXJuGRqbDaN35XNqIWAHu2bjLXld4Dy6+MuVX8kCSpkBJgLQczxbsRKvIJ5
liXepRjrtFSn0kV5qTzO8QtSC2fGNPvx6CJC0aXelvPw1z08DWaKZqAFa1Qf3lM=
=WzLz
-----END PGP SIGNATURE-----

--nextPart1934833.585B2BI6mb--