Skip to content

Instantly share code, notes, and snippets.

@warptangent

warptangent/rebase_blockchain_to_upstream2

Created January 5, 2015 04:48
Show Gist options
  • Save warptangent/345da0ecc0d7cb891ba8 to your computer and use it in GitHub Desktop.
Save warptangent/345da0ecc0d7cb891ba8 to your computer and use it in GitHub Desktop.
Download ZIP
rebase_blockchain_to_upstream2 summary
Raw
rebase_blockchain_to_upstream2
rebase of blockchain branch to upstream master
Fixed 3 commits where there were CMake file conflicts.
Split the updates across 4 modified commits so that builds are still successful across the rewritten history.
Modifications were minor, only involving CMake files.
See the amended commit messages for details.
build: add liblmdb to the cmake autodetection system
https://github.com/warptangent/bitmonero/commit/0886183568a41b41c83e9cd7f624de295d8367c3
very, VERY primitive blockchain converter
https://github.com/warptangent/bitmonero/commit/4af0918501c40c20f9b42d1d2d7da154d365a58b
Integrate BlockchainDB into cryptonote_core
https://github.com/warptangent/bitmonero/commit/74a1a89e27c719811a1fcc0578e4795802555225
BlockchainDB unit tests, lmdb linker flag
https://github.com/warptangent/bitmonero/commit/1240cf805be0945fffaa4a59a5bd491893e44ed3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment