Code

Merge 1.2.0 back to compatible#9188

Code

Merged

lk86 merged 29 commits intocompatibleMinaProtocol/mina:compatiblefrom feature/merge-1.2.0-to-compatibleMinaProtocol/mina:feature/merge-1.2.0-to-compatibleCopy head branch name to clipboardJul 14, 2021

+17,816-60

Commits

Commits on Apr 29, 2021

• improve-bad-balance-scripting Add conditional for the ----- lines

  lk86

  committed
  148207f

  Copy full SHA for 148207f

Commits on May 10, 2021

• Fix-all calls replayer

  psteckler

  committed
  87ee9bb

  Copy full SHA for 87ee9bb

Commits on Jun 16, 2021

• Merge branch 'release/1.1.6' into feature/upgrade-rust-ocaml

  lk86

  authored
  6b87edc

  Copy full SHA for 6b87edc

• Merge branch 'release/1.1.6' into improve-bad-balance-scripting

  lk86

  authored
  354e895

  Copy full SHA for 354e895

• Merge pull request #8815 from MinaProtocol/improve-bad-balance-scripting

  Show description for 0173032
  lk86

  authored
  0173032

  Copy full SHA for 0173032

• Merge branch 'release/1.1.6' into feature/upgrade-rust-ocaml

  lk86

  authored
  b863d0d

  Copy full SHA for b863d0d

• Merge pull request #8998 from MinaProtocol/feature/upgrade-rust-ocaml

  Show description for f010320
  lk86

  authored
  f010320

  Copy full SHA for f010320

Commits on Jun 17, 2021

• Revert "discard extra work even if there is space and budget"

  Show description for 0725c7a
  deepthiskumar

  committed
  0725c7a

  Copy full SHA for 0725c7a

Commits on Jun 18, 2021

• fix/diff-application-error Also add kubectl

  lk86

  committed
  b4bf9a2

  Copy full SHA for b4bf9a2

• Merge pull request #9068 from MinaProtocol/fix/diff-application-error

  Show description for 8809560
  lk86

  authored
  8809560

  Copy full SHA for 8809560

Commits on Jun 23, 2021

• add more logs for super catchup

  ghost-not-in-the-shell

  committed
  3d62450

  Copy full SHA for 3d62450

• simplify catchup states

  ghost-not-in-the-shell

  committed
  d246804

  Copy full SHA for d246804

• reformat

  ghost-not-in-the-shell

  committed
  29a0da7

  Copy full SHA for 29a0da7

Commits on Jun 24, 2021

• fix catchup being stuck

  ghost-not-in-the-shell

  committed
  ac31f20

  Copy full SHA for ac31f20

• address comments of izzy

  ghost-not-in-the-shell

  committed
  d0e07cc

  Copy full SHA for d0e07cc

• oops I forgot to change this back

  ghost-not-in-the-shell

  committed
  4034868

  Copy full SHA for 4034868

Commits on Jun 28, 2021

• fix type error

  ghost-not-in-the-shell

  committed
  3351b0a

  Copy full SHA for 3351b0a

• fix the indentation

  ghost-not-in-the-shell

  committed
  ffb901e

  Copy full SHA for ffb901e

• fix typo

  ghost-not-in-the-shell

  committed
  a650cec

  Copy full SHA for a650cec

Commits on Jun 29, 2021

• switch the order of add and remove

  ghost-not-in-the-shell

  committed
  810f029

  Copy full SHA for 810f029

• Merge pull request #9132 from MinaProtocol/fix/super-catchup-stuck-at-the-tip

  Show description for c856692
  lk86

  authored
  c856692

  Copy full SHA for c856692

Commits on Jul 7, 2021

• get_ledger in sys thread for release

  psteckler

  committed
  2bf1423

  Copy full SHA for 2bf1423

• Wrap a couple of Process.run

  psteckler

  committed
  6ed509a

  Copy full SHA for 6ed509a

Commits on Jul 8, 2021

• Merge pull request #9171 from MinaProtocol/fix/wrap-process-runs

  Show description for d03138e
  lk86

  authored
  d03138e

  Copy full SHA for d03138e

• Merge branch 'release/1.2.0' into feature/get-ledger-systhread-release

  psteckler

  authored
  a315803

  Copy full SHA for a315803

• Merge pull request #9168 from MinaProtocol/feature/get-ledger-systhread-release

  Show description for fc3cfa2
  lk86

  authored
  fc3cfa2

  Copy full SHA for fc3cfa2

Commits on Jul 12, 2021

• Merge branch 'compatible' into feature/merge-1.2.0-to-compatible

  mrmr1993

  committed
  52ea4c7

  Copy full SHA for 52ea4c7

• Reformat for OCaml upgrade

  mrmr1993

  committed
  ffa060e

  Copy full SHA for ffa060e

• Add type signature for ignored value to suppress a linter warning

  mrmr1993

  committed
  e9916a1

  Copy full SHA for e9916a1