[0.12] Backports #7405

1. 
   MarcoFalke commented at 9:59 PM on January 23, 2016: member

   No description provided.

2. [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH

   Github-Pull: #7384
   Rebased-From: faa9011d09d7429b97ec7595f9f77abf8ea770d3

   a83a371f44
3. 
   jonasschnelli commented at 4:01 PM on January 24, 2016: contributor

   Only critical bugs should be back ported IMO. We are already in rc2 stage.

4. jonasschnelli added the label GUI on Jan 24, 2016
5. 
   laanwj commented at 1:09 PM on January 25, 2016: member

   Agree with @jonasschnelli. On the other hand the risk of this introducing a regression is low.

   This is something that could be merged if we need to do a rc3 in the first place and won't label rc2 as final. Otherwise it could be merged after final for 0.12.1.

6. 
   MarcoFalke commented at 2:28 PM on January 25, 2016: member

   Sure, this was my intend. Just wait to see what other backports are required (if any).

7. [init] Clarify permitrbf help message

   Github-Pull: #7391
   Rebased-From: fae78fa81802b5387054715c339f286ef436408e

   6a048953b7
8. laanwj added this to the milestone 0.12.0 on Jan 27, 2016
9. 
   laanwj commented at 10:23 AM on January 28, 2016: member

   Agree with these (now that it's clear there will be a rc3)

10. 
    laanwj commented at 9:33 AM on February 3, 2016: member

    • Cherry-picked https://github.com/MarcoFalke/bitcoin/commit/a83a371f443b850b3450190ec8b4056b05f830eb (#7384) as 294f4320a246e453a0509c82b4112b2a5203dd81
    • https://github.com/MarcoFalke/bitcoin/commit/6a048953b7808c0fc7653cb50ee5a9d861c24519 (#7391) is already part of 0.12 through #7440
11. laanwj closed this on Feb 3, 2016

    ---

12. MarcoFalke deleted the branch on Feb 3, 2016
13. MarcoFalke locked this on Sep 8, 2021

Milestone
0.12.0