Merge 1.7 to develop - Githubissues

basho / bitcask

because you need another a key/value storage engine

1.28k stars 171 forks source link

Merge 1.7 to develop #241

Closed nickelization closed 8 years ago

nickelization commented 8 years ago

This forward merges a few fixes from the 1.7 branch into the develop branch. Somehow we have ended up with 1.7.4 being equivalent to 2.0.2 but with extra fixes added, so basically 1.7.4 is an update to 2.0.2, which makes no sense. From here on out I'd like to abandon the 1.7 line, and work from develop, with the next release being tagged as 2.0.3.

EDIT: I also added a commit in this PR to update the vsn string to 2.0.3.

jvoegele commented 8 years ago

+1 331a7b9103d8ab4221b8f563ce19db085a973550

nickelization commented 8 years ago

@borshop merge