Add updated bitcoin.conf from wiki + regtest #4306

pull gdm85 wants to merge 134 commits into bitcoin:master from gdm85:master changing 218 files +11697 −4919
  1. gdm85 commented at 8:07 AM on June 8, 2014: contributor

    In this bitcoin.conf I use basically the config from wiki plus a few changes:

    • removed reference to allow payment via IP
    • added reference to regtest

    It's important that eventually we get this default config for Debian up to standards e.g. all options in the default config, commented with the default value they have when running. This is a first step.

  2. in contrib/debian/examples/bitcoin.conf:None in d87979e74b outdated
      13 | +#regtest=0
      14 |  
      15 |  # Connect via a socks4 proxy
      16 |  #proxy=127.0.0.1:9050
      17 |  
      18 | +##############################################################
    


    sipa commented at 8:27 AM on June 9, 2014:

    Also: -connect disables listening (by default, you can re-enable it with -listen).

  3. in contrib/debian/examples/bitcoin.conf:None in d87979e74b outdated
      66 | +#rpctimeout=30
      67 |  
      68 |  # By default, only RPC connections from localhost are allowed.  Specify
      69 |  # as many rpcallowip= settings as you like to allow connections from
      70 | -# other hosts (and you may use * as a wildcard character):
      71 | +# other hosts (and you may use * as a wildcard character).
    


    laanwj commented at 11:07 AM on June 9, 2014:

    Instead of * syntax, we've switched to subnet-based matching recently so

    rpcallowip=10.1.1.34/255.255.255.0
    rpcallowip=1.2.3.4/24
    rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
    ...
    
  4. in contrib/debian/examples/bitcoin.conf:None in d87979e74b outdated
       7 |  
       8 |  # Run on the test network instead of the real bitcoin network.
       9 | -#testnet=1
      10 | +#testnet=0
      11 | +
      12 | +# Run on the regression test network
    


    laanwj commented at 11:07 AM on June 9, 2014:

    I'm not sure we should be talking about "the regression test network", as there is no global regression test network. Maybe "a" is better?


    gdm85 commented at 8:40 AM on June 10, 2014:

    correct

  5. in contrib/debian/examples/bitcoin.conf:None in d87979e74b outdated
      97 | +#rpcsslprivatekeyfile=server.pem
      98 |  
      99 |  
     100 |  # Miscellaneous options
     101 |  
     102 |  # Set gen=1 to attempt to generate bitcoins
    


    laanwj commented at 11:07 AM on June 9, 2014:

    Let's just remove this. No one is (or should be) using the internal miner.


    gdm85 commented at 8:41 AM on June 10, 2014:

    agreed

  6. laanwj commented at 11:08 AM on June 9, 2014: member

    Thanks for trying to improve the documentation!

  7. gdm85 commented at 8:42 AM on June 10, 2014: contributor

    @laanwj you're welcome! Since this was not referenced by any other PR/commit I will update this PR with the proposed amendments

  8. Also switch the (unused) verification code to low-s instead of even-s.
    a81cd968 introduced a malleability breaker for signatures
    (using an even value for S). In e0e14e43 this was changed to
    the lower of two potential values, rather than the even one.
    Only the signing code was changed though, the (for now unused)
    verification code wasn't adapted.
    795a9a5dc4
  9. Fix transaction tests
    Conflict between low-s (6fd7ef2) and test updates in d3a33fc.
    75b5258012
  10. Remove NumBlocksOfPeers
    Generally useless information. Only updates on connect time, not after
    that. Peers can easily lie and the median filter is not effective in
    preventing that.
    
    In the past it was used for progress display in the GUI but
    `CheckPoints::guessVerificationProgress` provides a better way that is now used.
    It was too easy to mislead it. Peers do lie about it in practice, see issue #4065.
    
    From the RPC, `getpeerinfo` gives the peer raw values, which are more
    useful.
    700b5b326d
  11. Deduplicate shared code between uint160 and uint256 3c756ece90
  12. Exception instead of assigning 0 in case of wrong vector length eac09b2139
  13. Add multiplication and division to uint160/uint256 ae87b1138b
  14. Move {Get,Set}Compact from bignum to uint256 402c56a9d3
  15. Deduplicate uint* comparison operator logic 3f2938662a
  16. util: add parseint32 function with strict error reporting
    None of the current integer parsing functions in util
    check whether the result is valid and fits in the range
    of the type. This is required for less sloppy error reporting.
    e6d92f7aa8
  17. Use new function parseint32 in SplitHostPort
    Use the new function parseint32 in SplitHostPort instead of calling
    strtol directly.
    0424501c92
  18. net: Add CSubNet class for subnet matching 188e2e6a92
  19. rpc: Use netmasks instead of wildcards for IP address matching
    `-rpcallowip` currently has a wacky wildcard-based format. After this
    commit it will accept the more standard format, for example:
    
    - Ranges with netmask 127.0.0.0/255.255.255.0, ::/0
    - Ranges with cidr 12.3.4.5/24, 12:34:56:78:9a:bc:de:00/112
    - Loose IPs ::1, 127.0.0.1
    
    Trying to use the old *?-based format will result in an error message at
    launch.
    726deb0537
  20. Remove unused function WildcardMatch
    No longer necessary after implementing netmask-based matching.
    Also remove a longer-unused function `skipspaces`.
    b6bf407f95
  21. Add tests for BoostAsioToCNetAddr 13b6a0199d
  22. fixes #4163 e8f3c7ac90
  23. Reduce bignum.h now it is only needed for scriptnum_tests efc13749f3
  24. Move bignum.h to test/ 510e84bf61
  25. Switch stdout to line buffering
    Use line buffering (instead of block buffering) so that messages arrive
    immediately in systemd-journald, tail -f debug.log, and the like.
    a742f26f55
  26. Squashed 'src/leveldb/' changes from 9094c7f..7924331
    42dcc7e Merge upstream LevelDB 1.17.
    e353fbc Release LevelDB 1.17
    269fc6c Release LevelDB 1.16
    REVERT: 9094c7f Temporarily revert to writing .sst files instead of .ldb
    
    git-subtree-dir: src/leveldb
    git-subtree-split: 79243314e40ac31d79c68e5658a1d6a64800d50b
    d895b422ab
  27. Move base58.h implementation code to base58.cpp 3e4e51fc2c
  28. Remove dummy PRIszX macros for formatting
    Size specifiers are no longer needed now that we use typesafe tinyformat
    for string formatting, instead of the system's sprintf.
    
    No functional changes.
    
    This continues the work in #3735.
    459f820dc6
  29. rpc: pass errors from async_accept
    According to the [boost::asio documentation](http://www.boost.org/doc/libs/1_55_0/doc/html/boost_asio/reference/basic_socket_acceptor/async_accept/overload2.html),
    the function signature of the handler must be:
    
        void handler(
          const boost::system::error_code& error // Result of operation.
        );
    
    We were binding *all* the arguments, instead of all but the error,
    resulting in nullary function that never got the error. Fix this
    by adding an input argument substitution.
    771a510058
  30. rpc: Make sure conn object is always cleaned up
    Make sure conn object always gets cleaned up by using a
    `boost::shared_ptr`.
    
    This makes valgrind happy - before this commit, one connection object
    always leaked at shutdown, as well as can avoid other leaks, when
    for example an exception happens.
    
    Also add an explicit Close() to the !ClientAllowed path to make it similar
    to the normal path (I'm not sure whether it is needed, but it
    can't hurt).
    fd0dfdfab2
  31. doc: remove mention of `-rpctimeout` from man page
    That option hasn't existed for a long time.
    e1d64fc4a5
  32. rpc: keep track of acceptors, and cancel them in StopRPCThreads
    Fixes #4156.
    
    The problem is that the boost::asio::io_service destructor
    waits for the acceptors to finish (on windows, and boost 1.55).
    
    Fix this by keeping track of the acceptors and cancelling them before
    stopping the event loops.
    b2430bc73e
  33. qt: periodic language update
    Pull updated translations from Transifex.
    
    Add mn (Mongolian) language.
    
    Do not update English translation for now as we want to keep
    compatibility with 0.9.
    f26b062c40
  34. Fix build in OS X 10.9 2908fc5e38
  35. Add -rpcbind option to allow binding RPC port on a specific interface
    Add -rpcbind command option to specify binding RPC service on one
    or multiple specific interfaces.
    
    Functionality if -rpcbind is not specified remains the same as before:
    
    - If no -rpcallowip specified, bind on localhost
    - If no -rpcbind specified, bind on any interface
    
    Implements part of #3111.
    1956b6e824
  36. Support IPv6 lookup in bitcoin-cli even when IPv6 only bound on localhost
    First query in the current way (intelligently determining which network
    has a non-localhost interface). If this does not succeed, try plain
    lookup.
    
    Needed for testing.
    
    Fixes #1827 by always allowing IPv6 to be used.
    bca14ab256
  37. Add Python test for -rpcbind and -rpcallowip
    Add a new test, `rpcbind_test.py`, that extensively tests the new
    `-rpcbind` functionality.
    f373a6b924
  38. switch from boost int types to <stdint.h> 388cc1b10e
  39. json_spirit: #include <stdint.h> b26384466a
  40. removed a few unnecessary casts f35f3efaf8
  41. remove ParseString(...) which is never used 5312d7f475
  42. SetupEnvironment() - clean commit 9a354eacd8
  43. ProcessGetData(): abort if a block file is missing from disk 8578ca190d
  44. LoadBlockIndexDB(): Require block db reindex if any blk*.dat files are missing. 72add09639
  45. Remove extraneous c_str 0933ce4cb4
  46. Fix NameError in macdeploy script a1ef03a0c4
  47. Remove fDaemon flag checking on return from main(), which is useless and looks really strange. 96d57a1833
  48. gitian: Add OSX build descriptors
    Github-Pull: #4185
    Rebased-By: Wladimir J. van der Laan
    Rebased-From: bb5da27, 2288206, 7fe8fe6, f76db78, ebcf375, fa1ed7c, 397e9b8
    f7cdd212d4
  49. qt: Periodic language update 1b47fd68ce
  50. Add missing LOCK(cs_main) 695887a379
  51. Remove forward declaration for non-existent class CCoinsDB
    Found by stephenreed on #bitcoin.dev.
    43dd40211e
  52. Fix addnode "onetry": Connect with OpenNetworkConnection 251b993d68
  53. Update test_main.cpp
    i think should delete (#include "bitcoin-config.h")。
    3f040b799a
  54. Replace non-threadsafe strerror
    Log the name of the error as well as the error code if a network problem
    happens. This makes network troubleshooting more convenient.
    
    Use thread-safe strerror_r and the WIN32 equivalent FormatMessage.
    4837acab06
  55. Replace non-threadsafe gmtime and setlocale
    Make DateTimeStrFormat use boost::posix_time.
    
    Also re-enable the util_DateTimeStrFormat tests, as they are no
    longer platform specific.
    cc1d46011c
  56. qt: Periodic language update
    Last-minute language update before release 0.9.2.
    ea51fc67ef
  57. Add Tips and Tricks section to README 813b3bc00d
  58. doc: Add historical release notes for 0.9.1 884c38c4ca
  59. Fix warning when compiling in OS X 4a60941c2e
  60. Qt: Fix monospace font in osx 10.9
    The "Monospace" hint was added in Qt 4.8, and it works as intended as opposed
    to "TypeWriter" which fails to load a font.
    3e88cdc969
  61. remove CWallet::AddReserveKey which is never used 2e7a98f990
  62. remove CTransaction::IsNewerThan which is never used f94a265c06
  63. remove LogException( ) which is never used 83f07146b6
  64. remove LookupHostNumeric( ) which is never used b8718712eb
  65. remove GetMedianTime( ) which is never used e92defbb0b
  66. remove CPubKey::VerifyCompact( ) which is never used 4344d7d76a
  67. Remove redundant c_str b29974178d
  68. Add CODESEPARATOR/FindAndDelete() tests f98b0a8d0f
  69. Fix incorrect checkpoint data for testnet3 4f201c7e8f
  70. Doc: Always use absolute paths c6363ef2f4
  71. Spelling fix in comment
    Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com>
    Rebased-From: 3704a6a
    31a2910264
  72. [Qt] Fix Start bitcoin on system login 0afe0abfce
  73. add DEFAULT_UPNP constant in net
    - as this is a shared Core/GUI setting, this makes it easier to keep them
      in sync (also no new includes are needed)
    cc67fbda8f
  74. release: Bump the OSX SDK to 10.7 for gitian builds
    This fixes the display on Retina Macbooks. It also moves us away from depending
    on the ancient XCode3 sdk.
    f5b7be4dc2
  75. gitian: Add cfields to gitian download scripts a614578501
  76. Fix name of Cory's pgp key 6737a52b46
  77. No references to centralized databases in help text. 4e9c606885
  78. Remove unused imports in macdeploy script 3108f879a5
  79. osx: Fix missing dock menu with qt5
    Qt5 Removed the qt_mac_set_dock_menu function and left no replacement. It was
    later re-added and deprecated for backwards-compatibility.
    
    Qt5.2 adds the non-deprecated QMenu::setAsDockMenu(). Use that when possible.
    cc6c6e31b6
  80. doc: Clarify wording about testing in README.md
    Weaken and clarify the wording a bit, it currently implies that we get
    more pull requests than we can ever handle which discourages
    contribution.
    d63f7d7ffb
  81. remove dup of extern int nConnectTimeout; in netbase 3cd30813e5
  82. Limit number of known addresses per peer 4f76ff2a1b
  83. Periodic language update
    Pull updated translations from Transifex before 0.9.2
    57a8590a58
  84. Fix stray uppercase A in tx_valid.json. 7c2bf39313
  85. Use pnode->nLastRecv as sync score directly
    NodeSyncScore() should find the node which we recv data most recently, so put a negative sign to pnode->nLastRecv is indeed wrong.
    
    Also change the return value type to int64_t.
    
    Signed-off-by: Huang Le <4tarhl@gmail.com>
    2a58d36c79
  86. [Qt] Fix Transaction details shows wrong To: 44ab8df8f3
  87. Make links on 'About Bitcoin Core' into clickable (squashed 5 comits into one)
    Made the following links clickable:
    http://www.opensource.org/licenses/mit-license.php
    http://www.openssl.org/
    eay@cryptsoft.com
    
    (Squashed commits into one commit as suggested by @laanwj)
    
    Replaced label with text browser on About Bitcoin Core Screen
    
    So that the links on the About screen can be clickable
    
    Replaced html property with text property
    
    I have now removed unnecessary html so this should make life easier for
    translators and you @Diapolo :). What do you think?
    
    The size of the window needs to change
    
    The size of the window needs to change when you make links clickable.
    Thanks  for pointing that out @laanwj
    
    Using the https://www.openssl.org over the http link
    
    Using the https://www.openssl.org over the http link as suggested by
    @Diapolo
    3dcd3a5883
  88. [Qt] ensure payment request network matches client network
    - replaces checks in SendCoinsDialog::handlePaymentRequest() that belong
      to PaymentServer (normal URIs are special cased, as only an isValid
      check is done on BTC addresses)
    - prevents the client to handle payment requests that do not match the
      clients network and shows an error instead (mainly a problem with
      drag&drop payment requests onto the client window)
    - includes some small comment changes also
    f8e900bc44
  89. added many rpc wallet tests
    deleted the empty no throw test in rpc_wallet_tests line 65
    
    fixed some comments
    
    starting verify tests
    
    finished verify message tests
    
    changed some comments
    b343f7b7db
  90. Properly initialize CWallet::nTimeFirstKey 9497e562ae
  91. Qt: Add GUI view of peer information. #4133 1ee031fbde
  92. [Qt] style police and small addition in rpcconsole
    - fix spaces, indentation and coding style glitches
    de428ff1d4
  93. Some documentation fixes + link to my Docker/LXC guide
    I added a link to my guide about using docker containers + LXC (I am planning to maintain this at work
    for future bitcoin versions), then I mentioned other virtualization options (KVM, LXC).
    This commit includes a fix issue for documentation issue #4269 that consists in telling users to
    checkout correct bitcoin version before using the gitian descriptors (otherwise all hell can break loose).
    Also, I replaced URL for Debian 7.4 ISO with a correct one and added link to official Debian ISO sources.
    fe4a974cb6
  94. VerifyDB progress 4dbfddb0ab
  95. Remove template matching params from GetOpName()
    Since they are not real opcodes, being reported as OP_UNKNOWN is less confusing for human-readable decoding.
    
    Signed-off-by: Huang Le <4tarhl@gmail.com>
    ae7589d63d
  96. Make max number of orphan blocks kept in memory a startup parameter (fixes #4253) b76c04a018
  97. rename fNoListen to fListen and move to net
    - better code readability and it belongs to net
    - this is a prerequisite for a pull to add -listen to the GUI
    2d1e52efda
  98. CWallet: fix nTimeFirstKey init, by making constructor init common code
    Don't repeat yourself etc.
    f22f00e8dc
  99. gitian: make linux qt intermediate deterministic
    A qt installation date snuck into the host utils (lrelease etc)
    This doesn't affect the end product, so no dependency version bump.
    
    It also doesn't explain why gavin's and mine build is different
    5f81f6fb5a
  100. doc: Update hash in release process for new windows deps intermediate
    This was forgotten in 25d4911.
    693344e1d8
  101. log used config file to debug.log on startup b511c50a29
  102. Remove side effect in assertion in ProcessGetData
    A side-effect was introduced into an assertion in 7a0e84d. This commit
    fixes that.
    9f96f4d56f
  103. [Qt] add BerkeleyDB version info to RPCConsole
    - to match info function between debug.log and RPCConsole
    f3d9b1bcc1
  104. Fix GUI build with `--disable-wallet`
    fe6bff2 and 65f78a1 broke it. Minor build changes.
    dd9bf25bd0
  105. Remove global strWalletFile
    As it says on the tin. There is no need to have this variable be
    global, it's only used in AppInit2.
    4643356287
  106. build: Switch to non-recursive make
    Build logic moves from individual Makefile.am's to include files, which
    the main src/Makefile.am includes. This avoids having to manage a gigantic
    single Makefile.
    
    TODO: Move the rules from the old Makefile.include to where they actually
    belong and nuke the old file.
    cacd56641e
  107. build: delete old Makefile.am's c02fba776c
  108. build: add stub makefiles for easier subdir builds 158781845e
  109. build: nuke Makefile.include from orbit
    Rules and targets no longer need to be shared between subdirectories, so
    this is no longer needed.
    05ef21c729
  110. build: Tidy up file generation output
    - Some file generation was still noisy, silence it.
    - AM_V_GEN is used rather than @ so that 'make V=1' works as intended
    - Cut down on file copies and moves when using sed, use pipes instead
    - Avoid the use of top_ and abs_ dirs where possible
    7982470688
  111. build: avoid the use of top_ and abs_ dir paths
    Using them has the side effect of confusing the dependency-tracking logic.
    a7f12a5900
  112. build: quit abusing AM_CPPFLAGS
    Now that the build is non-recursive, adding to AM_CPPFLAGS means adding to
    _all_ cppflags.
    
    Logical groups of includes have been added instead, and are used individually
    by various targets.
    d2cd381fa5
  113. build: fix version dependency 044740c115
  114. qt: PeerTableModel: Fix potential deadlock. #4296 77bb75aae2
  115. Type-safe CFeeRate class
    Use CFeeRate instead of an int64_t for quantities that are
    fee-per-size.
    
    Helps prevent unit-conversion mismatches between the wallet,
    relaying, and mining code.
    846dd484cd
  116. Allow multiple regression tests to run at once
    Choose ports at startup based on PID, so multiple regression tests
    can run on the same system at the same time.
    82feec772a
  117. estimatefee / estimatepriority RPC methods
    New RPC methods: return an estimate of the fee (or priority) a
    transaction needs to be likely to confirm in a given number of
    blocks.
    
    Mike Hearn created the first version of this method for estimating fees.
    It works as follows:
    
    For transactions that took 1 to N (I picked N=25) blocks to confirm,
    keep N buckets with at most 100 entries in each recording the
    fees-per-kilobyte paid by those transactions.
    
    (separate buckets are kept for transactions that confirmed because
    they are high-priority)
    
    The buckets are filled as blocks are found, and are saved/restored
    in a new fee_estiamtes.dat file in the data directory.
    
    A few variations on Mike's initial scheme:
    
    To estimate the fee needed for a transaction to confirm in X buckets,
    all of the samples in all of the buckets are used and a median of
    all of the data is used to make the estimate. For example, imagine
    25 buckets each containing the full 100 entries. Those 2,500 samples
    are sorted, and the estimate of the fee needed to confirm in the very
    next block is the 50'th-highest-fee-entry in that sorted list; the
    estimate of the fee needed to confirm in the next two blocks is the
    150'th-highest-fee-entry, etc.
    
    That algorithm has the nice property that estimates of how much fee
    you need to pay to get confirmed in block N will always be greater
    than or equal to the estimate for block N+1. It would clearly be wrong
    to say "pay 11 uBTC and you'll get confirmed in 3 blocks, but pay
    12 uBTC and it will take LONGER".
    
    A single block will not contribute more than 10 entries to any one
    bucket, so a single miner and a large block cannot overwhelm
    the estimates.
    251fda9977
  118. gitian: upgrade OpenSSL to 1.0.1h
    Upgrade for https://www.openssl.org/news/secadv_20140605.txt
    
    Just in case - there is no vulnerability that affects ecdsa signing or
    verification.
    
    The MITM attack vulnerability (CVE-2014-0224) may have some effect on
    our usage of SSL/TLS.
    
    As long as payment requests are signed (which is the common case), usage
    of the payment protocol should also not be affected.
    
    The TLS usage in RPC may be at risk for MITM attacks. If you have
    `-rpcssl` enabled, be sure to update OpenSSL as soon as possible.
    3998f729dd
  119. qt: Periodic translation update 2e79069358
  120. Fix compiler warnings
    Fixes the following compiler warning
    
    ```
    miner.cpp: In constructor ‘COrphan::COrphan(const CTransaction*)’:
    miner.cpp:69:14: warning: ‘COrphan::feeRate’ will be initialized after [-Wreorder]
         CFeeRate feeRate;
                  ^
    miner.cpp:68:12: warning:   ‘double COrphan::dPriority’ [-Wreorder]
         double dPriority;
                ^
    miner.cpp:71:5: warning:   when initialized here [-Wreorder]
         COrphan(const CTransaction* ptxIn) : ptx(ptxIn), feeRate(0), dPriority(0)
    ```
    5a1ac132cd
  121. Add updated bitcoin.conf from wiki + some updates 26903aefa5
  122. Update translation_process.md
    Qt changed to Bitcoin Core
    b7600f1775
  123. Get rid of the static chainMostWork (optimization) 06283ca75e
  124. Allow ActivateBestChain to release its lock on cs_main f9631b5d2b
  125. Move all post-chaintip-change notifications to ActivateBestChain edd0076be4
  126. Push cs_mains down in ProcessBlock 559942ee4a
  127. Add MiningRequiresPeers chain parameter 68390901cb
  128. Add MineBlocksOnDemand chain parameter ec183ee847
  129. Add DefaultMinerThreads chain parameter 104c2ea61f
  130. Add DefaultCheckMemPool chain parameter 156563181f
  131. Get rid of RegTest() b4b91bac2e
  132. Move majority constants to chainparams fc37b2f24c
  133. Add AllowMinDifficultyBlocks chain parameter ea2d4cb775
  134. Add RequireStandard chain parameter 10dee6c098
  135. Add RPCisTestNet chain parameter 2d00f54fab
  136. Get rid of TestNet() 583b2b0fd6
  137. Replace virtual methods with static attributes, chainparams.h depends on
    protocol.h instead of the other way around
    c5d73b00f6
  138. net.h was using std namespace through chainparams.h included in protocol.h ab6df04621
  139. Use Params().NetworkID() instead of TestNet() from the payment protocol 8f1abd6b76
  140. [Qt] Improve rpc console history behavior 0b8ce70670
  141. [Qt] Remove CENT-fee-rule from coin control completely a93ee3e6b9
  142. gdm85 commented at 9:46 AM on June 10, 2014: contributor

    will provide a new PR

  143. gdm85 closed this on Jun 10, 2014

  144. laanwj commented at 10:45 AM on June 10, 2014: member

    You almost never need to open a new PR, you can just push -f to the branch of the old one.

  145. gdm85 commented at 10:57 AM on June 10, 2014: contributor

    @laanwj right, except that here I had first merged from upstream and then when forking again I got a weird GitHub issue (you can still see this PR as coming from 'unknown repository'). The nice GitHub support guys answered quickly allowing me to use the new fork and now I have made #4317 In future I might not want to merge from upstream before doing a push -f

  146. BitcoinPullTester commented at 11:14 AM on June 10, 2014: none

    Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/a95911a70ecf8c3efdcc938a9e9a317e59e28c75 for test log.

    This pull does not merge cleanly onto current master This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

  147. laanwj commented at 11:31 AM on June 10, 2014: member

    If you pull from upstream you should do pull --rebase (or alternatively, fetch and then rebase). You don't want to introduce merge commits.

  148. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-15 00:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me