aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #8626: Berkeley DB v6 compatibility fixWladimir J. van der Laan2016-08-311-1/+1
|\ | | | | | | 323a5fe Berkeley DB v6 compatibility fix (Alexey Vesnin)
| * Berkeley DB v6 compatibility fixAlexey Vesnin2016-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes building error looking like this: CXX wallet/libbitcoin_wallet_a-db.o wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’: wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous DbEnv(0).remove(strPath.c_str(), 0); ^ wallet/db.cpp:46:16: note: candidates are: In file included from wallet/db.h:21:0, from wallet/db.cpp:6: /usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&) DbEnv(const DbEnv &); ^ /usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV) DbEnv(DB_ENV *dbenv); ^ /usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t) DbEnv(u_int32_t flags); ^ Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1
* | Merge #8611: Reduce default number of blocks to check at startupWladimir J. van der Laan2016-08-301-1/+1
|\ \ | | | | | | | | | 203f212 Reduce default number of blocks to check at startup (Pieter Wuille)
| * | Reduce default number of blocks to check at startupPieter Wuille2016-08-271-1/+1
| | |
* | | Merge #8566: Easy to use gitian building scriptWladimir J. van der Laan2016-08-302-0/+391
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3fe0b68 Set defaults to gitian defaults (Andrew Chow) 6ffd6b4 Create option to detach sign gitian builds and not commit the files in the script (Andrew Chow) 498d8da Check for OSX SDK (Andrew Chow) eda4cfb Create an easy to use gitian building script (Andrew Chow)
| * | | Set defaults to gitian defaultsAndrew Chow2016-08-281-3/+3
| | | | | | | | | | | | | | | | Set the default -j and -m to 2 and 2000 respectively, matching gitian's default values.
| * | | Create option to detach sign gitian builds and not commit the files in the ↵Andrew Chow2016-08-271-25/+44
| | | | | | | | | | | | | | | | | | | | | | | | script Gitian builds can be done where the assert files are made but no signing is done. The sigs can also optionally not be committed automatically.
| * | | Check for OSX SDKAndrew Chow2016-08-271-0/+7
| | | |
| * | | Create an easy to use gitian building scriptAndrew Chow2016-08-272-0/+365
| |/ / | | | | | | | | | I've written a script that automates the setup and building of binaries with gitian. All of the commands are pulled from various documentation on gitian building.
* | | Merge #8625: [doc] - clarify statement about parallel jobs in rpc-tests.pyMarcoFalke2016-08-301-2/+2
|\ \ \ | |_|/ |/| | | | | 1467561 [doc] - clarify statement about parallel jobs in rpc-tests.py (isle2983)
| * | [doc] - clarify statement about parallel jobs in rpc-tests.pyisle29832016-08-291-2/+2
|/ /
* | Merge #8624: [doc] build: Mention curlPieter Wuille2016-08-292-4/+7
|\ \ | | | | | | | | | fae6bb8 [doc] build: Mention curl (MarcoFalke)
| * | [doc] build: Mention curlMarcoFalke2016-08-292-4/+7
| | |
* | | Merge #8617: Include instructions to extract Mac OS X SDK on Linux using ↵Pieter Wuille2016-08-292-1/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7zip and SleuthKit b729fcd Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKit (Luke Dashjr)
| * | | Include instructions to extract Mac OS X SDK on Linux using 7zip and SleuthKitLuke Dashjr2016-08-292-1/+45
| | | |
* | | | Merge #8564: [Wallet] remove unused code/conditions in ReadAtCursorPieter Wuille2016-08-293-11/+9
|\ \ \ \ | |_|/ / |/| | | | | | | beef966 [Wallet] remove unused code/conditions in ReadAtCursor (Jonas Schnelli)
| * | | [Wallet] remove unused code/conditions in ReadAtCursorJonas Schnelli2016-08-233-11/+9
| | | |
* | | | Merge #8607: [doc] Fix doxygen off-by-one comments, fix typosWladimir J. van der Laan2016-08-288-44/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fafe7b3 contrib: Make fix-copyright-headers.py more portable (MarcoFalke) fa27c0a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke) fabfd5d [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke) 67a5502 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
| * | | | contrib: Make fix-copyright-headers.py more portableMarcoFalke2016-08-221-1/+1
| | | | |
| * | | | [doc] Fix typos in comments, doxygen: Fix comment syntaxMarcoFalke2016-08-225-37/+37
| | | | |
| * | | | [qa] pull-tester: Don't mute zmq ImportErrorMarcoFalke2016-08-221-5/+5
| | | | |
| * | | | init: Fix typo in help message for -whitelistforcerelayWladimir J. van der Laan2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | Reported by pryds on Transifex in the Danish translation.
* | | | | Merge #8573: Set jonasschnellis dns-seeder filter flagPieter Wuille2016-08-281-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | 40a95cf Set jonasschnellis dns-seeder filter flag (Jonas Schnelli)
| * | | | Set jonasschnellis dns-seeder filter flagJonas Schnelli2016-08-241-1/+1
| | | | |
* | | | | Merge #8545: [doc] Update git-subtree-check.sh READMEPieter Wuille2016-08-261-1/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | fa3d974 [doc] Update git-subtree-check.sh README (MarcoFalke)
| * | | | [doc] Update git-subtree-check.sh READMEMarcoFalke2016-08-191-1/+2
| | | | |
* | | | | Merge #8109: Do not shadow member variablesPieter Wuille2016-08-262-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ff8d279 Do not shadow member variables (Pavel Janík)
| * | | | | Do not shadow member variablesPavel Janík2016-07-312-10/+10
| | | | | |
* | | | | | Merge #8602: [trivial][doc] Mention ++i as preferred over i++ in dev notesWladimir J. van der Laan2016-08-261-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ab53207 [trivial][doc] Mention ++i as preferred to i++ in dev notes (fanquake)
| * | | | | | [trivial][doc] Mention ++i as preferred to i++ in dev notesfanquake2016-08-261-3/+4
| | | | | | |
* | | | | | | Merge #8603: [trivial][doc] Mention gpg --refresh-keys in release-process.mdWladimir J. van der Laan2016-08-261-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | c25083b [trivial][doc] Mention gpg --refresh-keys in release-process.md (fanquake)
| * | | | | | [trivial][doc] Mention gpg --refresh-keys in release-process.mdfanquake2016-08-261-1/+2
|/ / / / / /
* | | | | | Merge #8590: Remove unused variablesWladimir J. van der Laan2016-08-264-6/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fa6dc9f Remove unused variables (MarcoFalke)
| * | | | | | Remove unused variablesMarcoFalke2016-08-254-6/+2
| | | | | | |
* | | | | | | Merge #8581: [wallet] rpc: Drop misleading optionWladimir J. van der Laan2016-08-263-28/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fab5ecb [wallet] rpc: Drop misleading option (MarcoFalke)
| * | | | | | | [wallet] rpc: Drop misleading optionMarcoFalke2016-08-243-28/+22
| | | | | | | |
* | | | | | | | Merge #8583: Show XTHIN in GUIWladimir J. van der Laan2016-08-262-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c3e2cb Show XTHIN in GUI (R E Broadley)
| * | | | | | | | Show XTHIN in GUIR E Broadley2016-08-252-0/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge #8561: Show "end" instead of many zeros when getheaders request ↵Wladimir J. van der Laan2016-08-261-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | received with a hashStop of Null 259ee09 Show "end" instead of many zeros when getheaders request received with a hashStop of Null. (R E Broadley)
| * | | | | | | | Show "end" instead of many zeros when getheaders request received with a ↵R E Broadley2016-08-231-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | hashStop of Null.
* | | | | | | | Merge #8462: Move AdvertiseLocal debug output to net categoryPieter Wuille2016-08-252-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | f13c1ba Move AdvertiseLocal debug output to net category (Michael Rotarius)
| * | | | | | | | Move AdvertiseLocal debug output to net categoryMichael Rotarius2016-08-052-3/+3
| | | | | | | | |
* | | | | | | | | Merge #7579: [Qt] show network/chain errors in the GUIJonas Schnelli2016-08-251-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
| * | | | | | | | | [Qt] show network/chain errors in the GUIJonas Schnelli2016-07-201-3/+5
| | | | | | | | | |
* | | | | | | | | | Merge #8226: contributing.md: Fix formatting (line lengths and smart quotes)Pieter Wuille2016-08-251-33/+109
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | be1d451 contributing.md: Fix formatting (Will Binns)
| * | | | | | | | | contributing.md: Fix formattingWill Binns2016-06-231-33/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains two changes to CONTRIBUTING.md that: Fix line line lengths. There were several instances where line lengths were well over 80 characters. This commit adjusts them to make them conform to formatting best practices, to stay under 80 characters when possible. Adhere to consist use of quotes. There are a few instances where smart quotes are used (perhaps because it was pasted from a word processor). This commit replaces them with dumb quotes to keep it consistent with the quotation formatting found in the rest of the document.
* | | | | | | | | | Merge #8487: Persist the datadir after option resetJonas Schnelli2016-08-252-1/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57acb82 Load choose datadir dialog after options reset (Andrew Chow) 15df3c1 Persist the datadir after option reset (Andrew Chow)
| * | | | | | | | | | Load choose datadir dialog after options resetAndrew Chow2016-08-242-1/+5
| | | | | | | | | | |
| * | | | | | | | | | Persist the datadir after option resetAndrew Chow2016-08-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a reset is performed, the datadir setting is saved and readded to the settings so that it is persisted across option resets.
* | | | | | | | | | | Merge #8578: [test] Remove unused codeMarcoFalke2016-08-254-23/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa1cf9e [test] Remove unused code (MarcoFalke)