Jimmy Kiselak
6bca5ead23
merge in changes from upstream
2015-05-20 10:26:14 -04:00
Wladimir J. van der Laan
377711ff3f
Merge pull request #5996
...
935bd0a
Chainparams: Refactor: Decouple main::GetBlockValue() from Params() [renamed GetBlockSubsidy] (Jorge Timón)
2015-05-19 11:42:47 +02:00
Wladimir J. van der Laan
e2e7f9513f
qt: fix unused function warning in scicon.cpp
...
Enclose MakeSingleColorImage in an anonymous namespace to avoid a
unused function warning on Windows and MacOSX.
Github-Pull: #6143
2015-05-19 11:27:54 +02:00
Wladimir J. van der Laan
be31ff7d8d
doc: Add historical release notes for 0.10.1 0.10.2 0.9.4
2015-05-18 20:48:09 +02:00
Wladimir J. van der Laan
a5a521e842
Merge pull request #6154
...
b448002
[Docs] fix and improve REST documentation (Jonas Schnelli)
2015-05-18 20:18:52 +02:00
Jonas Schnelli
b448002772
[Docs] fix and improve REST documentation
...
- fix bad formatting of getutxos
- added getztxos example
- fix different command syntax
2015-05-18 16:52:01 +02:00
Wladimir J. van der Laan
26e08a16a6
Merge pull request #6126
...
2457dc4
Change default nTxConfirmTarget to 2 (Alex Morcos)
77ed59d
wallet: Introduce constant for `-txconfirmtarget` default (Wladimir J. van der Laan)
2015-05-18 09:07:02 +02:00
Alex Morcos
2457dc43ac
Change default nTxConfirmTarget to 2
2015-05-18 09:01:30 +02:00
Wladimir J. van der Laan
77ed59df4d
wallet: Introduce constant for -txconfirmtarget
default
2015-05-18 09:00:24 +02:00
Wladimir J. van der Laan
a6d2e31e8b
Merge pull request #6144
...
881027a
Remove assertion from ~LockedPageManager (Wladimir J. van der Laan)
2015-05-18 07:53:09 +02:00
Wladimir J. van der Laan
ec81395a4c
Merge pull request #6150
...
3a6cc3c
Missing from Documentation Index (Shawn Wilkinson)
2015-05-18 07:52:19 +02:00
Gavin Andresen
3c60937ce6
Merge pull request #6146
...
f501054
More robust CScheduler unit test (Gavin Andresen)
2015-05-16 18:03:26 -04:00
Gavin Andresen
f50105486f
More robust CScheduler unit test
...
On a busy or slow system, the CScheduler unit test could fail because it
assumed all threads would be done after a couple of milliseconds.
Replace the hard-coded sleep with CScheduler stop() method that
will cleanly exit the servicing threads when all tasks are completely
finished.
2015-05-16 17:59:23 -04:00
Shawn Wilkinson
3a6cc3cbb6
Missing from Documentation Index
2015-05-16 12:00:50 -04:00
Wladimir J. van der Laan
ec82d8c99c
Merge pull request #6062
...
ff7fe8b
Fix for correctly including climits on certain platforms {DragonFlyBSD}. (sinetek)
2015-05-16 10:48:49 +02:00
Wladimir J. van der Laan
97ccfdca8a
Merge pull request #6137
...
a5baba5
minor: remove unneeded bool in CWalletDB::Recover (Philip Kaufmann)
2015-05-16 09:37:01 +02:00
Wladimir J. van der Laan
2a822987dd
Merge pull request #6129
...
c208040
Fix for clearing fCheckForPruning (Alex Morcos)
2015-05-15 17:32:54 +02:00
Jorge Timón
935bd0a447
Chainparams: Refactor: Decouple main::GetBlockValue() from Params() [renamed GetBlockSubsidy]
...
Remove redundant getter CChainParams::SubsidyHalvingInterval()
2015-05-15 16:12:30 +02:00
Wladimir J. van der Laan
ac75bafafd
qt: translations update
2015-05-15 14:00:56 +02:00
Wladimir J. van der Laan
e47c94e64c
Merge pull request #6135
...
f13dac9
Comment edits and cleanup (BitcoinPRReadingGroup)
ff734e9
Alphabetic order in makefile (Jorge Timón)
5207f33
fix header include groups (Philip Kaufmann)
59b149f
remove unneeded incude of wallet/db.h from rpcmining.cpp (Philip Kaufmann)
3703385
remove unused classes from db.h (Philip Kaufmann)
0a7bcb7
fix IDE/compiler warning "extra ';'" in validationinterface.h (Philip Kaufmann)
3b00e7c
[Trivial] Update COPYING (sandakersmann)
dd9e688
Trivial: Corrected owner of DNS seeder (ayeowch)
a60bfd8
[init] better message when no wallet support is compiled in (Philip Kaufmann)
78f44b6
Capitalized P2P (sandakersmann)
8e9248d
[Trivial] Cryptocurrency is one word (sandakersmann)
803f51e
Typo in GetRawMemPool RPC method help: "]" --> "}" (Chris Arnesen)
605a735
addrman: update comments (Pavel Vasin)
2015-05-15 13:59:07 +02:00
Alex Morcos
c208040354
Fix for clearing fCheckForPruning
...
Previously this was cleared only after UnlinkPrunedFiles, but it should really be cleared after FindFilesToPrune, regardless of whether there are any files to be pruned.
2015-05-15 07:58:41 -04:00
Wladimir J. van der Laan
f0043c2d6d
Merge pull request #5968
...
51aa249
Chainparams: Refactor: Decouple IsSuperMajority from Params() (Jorge Timón)
2015-05-15 13:52:54 +02:00
Wladimir J. van der Laan
6fb90d8983
Merge pull request #6102
...
86a5f4b
Relocate calls to CheckDiskSpace (Alex Morcos)
67708ac
Write block index more frequently than cache flushes (Pieter Wuille)
b3ed423
Cache tweak and logging improvements (Pieter Wuille)
fc684ad
Use accurate memory for flushing decisions (Pieter Wuille)
046392d
Keep track of memory usage in CCoinsViewCache (Pieter Wuille)
540629c
Add memusage.h (Pieter Wuille)
2015-05-15 13:43:02 +02:00
Wladimir J. van der Laan
63e7016566
Merge pull request #6140
...
8f0947b
Increase timeouts in pruning.py and modify warning language. (Alex Morcos)
b89f307
Fix incorrect variable name in FindFilesToPrune (Suhas Daftuar)
2015-05-15 13:37:31 +02:00
Wladimir J. van der Laan
16e8ea3dde
Merge pull request #6045
...
cc3db87
doc: Documentation in Markdown for Depends Dir (Shawn Wilkinson)
2015-05-15 12:35:58 +02:00
Shawn Wilkinson
cc3db874b5
doc: Documentation in Markdown for Depends Dir
...
Documentation more readable when viewed on Github.
Some extra changes by @laanwj:
- Make README.usage the default README. This is more convenient from a
user perspective. Link to other documentation in this default README
- Add list of popular targets for cross compilation, change default to
Win64 instead of Win32
2015-05-15 12:35:20 +02:00
Wladimir J. van der Laan
881027a79d
Remove assertion from ~LockedPageManager
...
This assertion will occur any time that the client quits without
shutting down properly due to an error condition. As the user will
report this error instead of the error that was the root cause, it is
better to remove it.
2015-05-15 11:44:58 +02:00
Gavin Andresen
b4c219b622
Merge pull request #5964
...
9a1dcea
Use CScheduler for net's DumpAddresses (Gavin Andresen)
ddd0acd
Create a scheduler thread for lightweight tasks (Gavin Andresen)
68d370b
CScheduler unit test (Gavin Andresen)
cfefe5b
scheduler: fix with boost <= 1.50 (Cory Fields)
ca66717
build: make libboost_chrono mandatory (Cory Fields)
928b950
CScheduler class for lightweight task scheduling (Gavin Andresen)
e656560
[Qt] add defaultConfirmTarget constant to sendcoinsdialog (Philip Kaufmann)
2015-05-14 14:27:07 -04:00
Gavin Andresen
9a1dcea2df
Use CScheduler for net's DumpAddresses
...
Instead of starting Yet Another Thread to dump addresses,
use CScheduler to do it.
2015-05-14 12:50:42 -04:00
Gavin Andresen
ddd0acd3db
Create a scheduler thread for lightweight tasks
2015-05-14 12:50:41 -04:00
Gavin Andresen
68d370bec4
CScheduler unit test
2015-05-14 12:50:41 -04:00
Wladimir J. van der Laan
339321522c
Merge pull request #6136
...
235b3a7
depends: sanity-check sources and cached builds (Cory Fields)
2015-05-14 17:51:00 +02:00
Cory Fields
cfefe5b88c
scheduler: fix with boost <= 1.50
2015-05-14 10:37:19 -04:00
Cory Fields
ca66717d89
build: make libboost_chrono mandatory
...
previously it was only used with certain boost versions. Now all versions
require it.
2015-05-14 10:37:19 -04:00
Gavin Andresen
928b950e3b
CScheduler class for lightweight task scheduling
...
Simple class to manage a task queue that is serviced by one or
more threads.
2015-05-14 10:37:19 -04:00
Philip Kaufmann
e656560edb
[Qt] add defaultConfirmTarget constant to sendcoinsdialog
...
- replaces some hard-coded values for the default confirmation target
- also simplify code that is using the new constant
2015-05-14 10:37:19 -04:00
Philip Kaufmann
a5baba52c5
minor: remove unneeded bool in CWalletDB::Recover
2015-05-14 15:55:17 +02:00
Wladimir J. van der Laan
a538126a8c
Merge pull request #6110
...
ca5f688
[QT] don't colorize icons on win and mac (Jonas Schnelli)
7247d10
[QT] use alert icon with tooltip insted of "(out of sync)" text (Jonas Schnelli)
51c7c70
[QT] remove frame to avoid double-frame situation in sendcoinsentry.ui (Jonas Schnelli)
2a6b844
[QT] change transaction amount and height in overview page (Jonas Schnelli)
2015-05-14 13:50:46 +02:00
Cory Fields
235b3a789d
depends: sanity-check sources and cached builds
...
In some cases (Travis), sources and build caches may be moved around in-between
builds, and we can't necessarily trust that everything is still intact.
This introduces pre-build checks that verify against stashed checksums.
Note that this will cause all sources to be re-downloaded, since cached sources
weren't trustworthy before this.
2015-05-14 01:33:07 -04:00
BitcoinPRReadingGroup
f13dac972c
Comment edits and cleanup
...
Original PR here: https://github.com/bitcoin/bitcoin/pull/6044
2015-05-14 01:02:01 -04:00
Jorge Timón
ff734e905f
Alphabetic order in makefile
2015-05-14 01:02:01 -04:00
Philip Kaufmann
5207f33f45
fix header include groups
2015-05-14 01:02:01 -04:00
Philip Kaufmann
59b149ff82
remove unneeded incude of wallet/db.h from rpcmining.cpp
2015-05-14 01:02:01 -04:00
Philip Kaufmann
3703385547
remove unused classes from db.h
2015-05-14 01:02:00 -04:00
Philip Kaufmann
0a7bcb7e55
fix IDE/compiler warning "extra ';'" in validationinterface.h
2015-05-14 01:02:00 -04:00
sandakersmann
3b00e7c231
[Trivial] Update COPYING
...
Corrected header
2015-05-14 01:02:00 -04:00
ayeowch
dd9e688b3b
Trivial: Corrected owner of DNS seeder
2015-05-14 01:02:00 -04:00
Philip Kaufmann
a60bfd810f
[init] better message when no wallet support is compiled in
2015-05-14 01:02:00 -04:00
sandakersmann
78f44b60d5
Capitalized P2P
...
Capitalized P2P
2015-05-14 01:02:00 -04:00
sandakersmann
8e9248d96b
[Trivial] Cryptocurrency is one word
...
Cryptocurrency was added to Oxford Dictionaries Online in May 2014.
2015-05-14 01:02:00 -04:00