Code

merge with upstream#4

Code

Merged

gruve-p merged 6 commits intoGroestlcoin:masterGroestlcoin/lightning:masterfrom ElementsProject:masterElementsProject/lightning:masterCopy head branch name to clipboardSep 14, 2018

+27-18

Commits

Commits on Sep 11, 2018

• ping: First parameter is called 'id' not 'peerid', fix help

  Show description for 84eacae
  

  laanwj

  authored and

  niftynei

  committed
  84eacae

  Copy full SHA for 84eacae

• ping: fix documentation in all remaining places {peerid} -> peer {id}

  niftynei

  committed
  cbac5ff

  Copy full SHA for cbac5ff

Commits on Sep 12, 2018

• CHANGELOG.md: update for 0.6.1 final.

  Show description for fdf67d6
  rustyrussell

  committed
  fdf67d6

  Copy full SHA for fdf67d6

Commits on Sep 14, 2018

• wire: add onion_defs.h to bolt-check, update quote.

  Show description for fc02af1
  

  rustyrussell

  authored and

  niftynei

  committed
  fc02af1

  Copy full SHA for fc02af1

• wire/Makefile: generate CSVs from specs based on BOLTVERSION.

  Show description for e8a7a7a
  

  rustyrussell

  authored and

  niftynei

  committed
  e8a7a7a

  Copy full SHA for e8a7a7a

• wire/gen_peer_wire: Update to BOLTVERSION.

  Show description for 10167ee
  

  rustyrussell

  authored and

  niftynei

  committed
  10167ee

  Copy full SHA for 10167ee