summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #613v0.9.1Riccardo Spagni2016-01-156-0/+30
|\ | | | | | | 30f92f5 Fix hf when import with verify off (Howard Chu)
| * Fix hf when import with verify offHoward Chu2016-01-156-0/+30
|/ | | | Delete the hf tables, so the next open will rescan and regenerate
* Merge pull request #612Riccardo Spagni2016-01-151-0/+8
|\ | | | | | | b9c7ba1 added checkpoints (Riccardo Spagni)
| * added checkpointsRiccardo Spagni2016-01-151-0/+8
| |
* | Merge pull request #611Riccardo Spagni2016-01-151-1/+1
|\| | | | | | | a583a96 bumped version to 0.9.1 for point release (Riccardo Spagni)
| * bumped version to 0.9.1 for point releaseRiccardo Spagni2016-01-151-1/+1
|/
* Merge pull request #610Riccardo Spagni2016-01-151-2/+1
|\ | | | | | | 945ac78 hardfork: fix accepting v2 blocks too early (moneromooo-monero)
| * hardfork: fix accepting v2 blocks too earlymoneromooo-monero2016-01-151-2/+1
| |
* | Merge pull request #609Riccardo Spagni2016-01-153-2/+4
|\ \ | | | | | | | | | | | | 0100e95 'max limit of...' is redundant wording, rephrase (binaryFate) 80e3889 Print msg when successfully updating out_peers (binaryFate)
| * | 'max limit of...' is redundant wording, rephrasebinaryFate2016-01-143-3/+3
| | |
| * | Print msg when successfully updating out_peersbinaryFate2016-01-141-0/+2
| | |
* | | Merge pull request #608Riccardo Spagni2016-01-152-0/+2
|\ \ \ | | | | | | | | | | | | e98a3f2 Fix da0bce34 (Howard Chu)
| * | | Fix da0bce34Howard Chu2016-01-122-0/+2
| |/ / | | | | | | | | | Windows doesn't define a default linker
* | | Merge pull request #607Riccardo Spagni2016-01-151-1/+0
|\ \ \ | |/ / |/| | | | | 0b6be41 There has never been any such function "fnctl" (Howard Chu)
| * | There has never been any such function "fnctl"Howard Chu2016-01-121-1/+0
|/ / | | | | | | It was only a typo of fcntl. Get rid of this test.
* | Merge pull request #606Riccardo Spagni2016-01-122-24/+64
|\ \ | | | | | | | | | | | | 8ce12a9 Fix arm asm (Howard Chu) 94de39f Tweak arm6 flags (Howard Chu)
| * | Fix arm asmHoward Chu2016-01-111-23/+63
| | | | | | | | | | | | About 10% faster than plain C mul128 on raspi1B
| * | Tweak arm6 flagsHoward Chu2016-01-111-1/+1
| |/
* | Merge pull request #605Riccardo Spagni2016-01-122-2/+5
|\ \ | | | | | | | | | fcf31f3 Cleanup symbol clashes, stdlib header (Howard Chu)
| * | Cleanup symbol clashes, stdlib headerHoward Chu2016-01-112-2/+5
| |/
* | Merge pull request #603Riccardo Spagni2016-01-121-0/+25
|\ \ | | | | | | | | | | | | | | | c5baf30 use load_file_to_string and exit with error on file read errors (Fabian Hirschmann) 7b2d27f remove new lines at the end of the password only (Fabian Hirschmann) 302cc9c add --password-file option (Fabian Hirschmann)
| * | use load_file_to_string and exit with error on file read errorsFabian Hirschmann2016-01-091-3/+9
| | |
| * | remove new lines at the end of the password onlyFabian Hirschmann2016-01-091-2/+2
| | |
| * | add --password-file optionFabian Hirschmann2016-01-091-0/+19
| |/
* | Merge pull request #601Riccardo Spagni2016-01-125-11/+64
|\ \ | |/ |/| | | | | | | | | 664dc42 rpc: fix missing target information in RPC call (moneromooo-monero) eaf4dcd daemon: fix status command when run from command line (moneromooo-monero) 67bbb56 wallet2: decide at runtime which upper tx size to use (moneromooo-monero) a44d94d rpc: is_key_image_spent now checks the tx pool too (moneromooo-monero)
| * rpc: fix missing target information in RPC callmoneromooo-monero2016-01-112-0/+3
| | | | | | | | | | | | | | which fixes the status command via RPC too. Turns out there are two versions of the GET_INFO call. I'd never noticed before.
| * daemon: fix status command when run from command linemoneromooo-monero2016-01-111-1/+1
| |
| * wallet2: decide at runtime which upper tx size to usemoneromooo-monero2016-01-102-6/+20
| | | | | | | | | | | | | | | | The value will be different depending on whether we've reached the first hard fork, which allows a larger size, or not. This fixes transactions being rejected by the daemon on mainnet where the first hard fork is not yet active.
| * rpc: is_key_image_spent now checks the tx pool toomoneromooo-monero2016-01-053-4/+40
|/
* Merge branch 'LMDB-tweaks'Riccardo Spagni2016-01-037-25/+23
|\
| * fixed conflictsRiccardo Spagni2016-01-037-25/+23
|/|
| * ARMv7 optimization flags are too aggressiveHoward Chu2016-01-031-2/+2
| |
| * ARM chars are unsignedHoward Chu2016-01-031-1/+1
| |
| * Use CMAKE_LINKER, not hardcoded "ld"Howard Chu2016-01-032-4/+4
| |
| * Avoid cmake-3.x block comment syntaxHoward Chu2016-01-031-4/+6
| |
| * Fix release flagsHoward Chu2016-01-021-2/+6
| | | | | | | | | | | | flags were being accumulated instead of being set. Win32 was getting -O2 -DNDEBUG -Ofast -DNDEBUG etc... Also for Win32, stay compatible to WinXP
| * IP_TOS not supported before Windows7Howard Chu2016-01-021-1/+4
| |
| * Get rid of doubly-defined NDEBUGHoward Chu2016-01-021-7/+0
| |
* | Merge pull request #595Riccardo Spagni2016-01-031-2/+6
|\ \ | | | | | | | | | a52cf36 fix: cmake parse error on Ubuntu 14.04 (moneroexamples)
| * | fix: cmake parse error on Ubuntu 14.04moneroexamples2016-01-031-2/+6
| |/ | | | | | | | | | | Parse error. Expected a command name, got unquoted argument with text "]]" Reason: Block comments are avaliable in cmake 3.0 not in 2.8 which is used in Ubuntu 14.04
* | Merge pull request #594Riccardo Spagni2016-01-031-1/+1
|\ \ | | | | | | | | | 7f8e5ce daemon: fix ban length using wrong parameter (moneromooo-monero)
| * | daemon: fix ban length using wrong parametermoneromooo-monero2016-01-021-1/+1
| |/
* | Merge pull request #593Riccardo Spagni2016-01-031-1/+2
|\ \ | |/ |/| | | a8caab1 unit_tests: initialize db object in ctor, not open (moneromooo-monero)
| * unit_tests: initialize db object in ctor, not openmoneromooo-monero2016-01-021-1/+2
|/ | | | open isn't actually called in those tests
* Merge pull request #588v0.9.0Riccardo Spagni2016-01-0113-17/+22
|\ | | | | | | | | e6dc448 updated readme, note CMake minimum version increase (Riccardo Spagni) 5c71f5d update version (Riccardo Spagni)
| * updated readme, note CMake minimum version increaseRiccardo Spagni2016-01-011-2/+6
| |
| * update versionRiccardo Spagni2015-12-3112-15/+16
|/
* Merge pull request #587Riccardo Spagni2015-12-313-31/+25
|\ | | | | | | 1e07110 Nicer looking exit when blockchain.bin is found (moneromooo-monero)
| * Nicer looking exit when blockchain.bin is foundmoneromooo-monero2015-12-313-31/+25
| | | | | | | | | | Do not print the exception message, and write the important bit in red, since people will only read the last line otherwise.
* | Merge pull request #586Riccardo Spagni2015-12-312-1/+7
|\ \ | | | | | | | | | 40f97ce core: do not use the persistent pool state for tests (moneromooo-monero)