Code

Cherry pick and resolve conflict#5376

Code

Merged

1 commit merged intorelease/v1.2hypermodeinc/dgraph:release/v1.2from kath/jaegar-backport-1.2hypermodeinc/dgraph:kath/jaegar-backport-1.2Copy head branch name to clipboardMay 6, 2020

+21

Commits

Commits on May 6, 2020

• Cherry pick and resolve conflict

  

  Katharine

  authored and

  kath-at-dgraph

  committed
  93ab406

  Copy full SHA for 93ab406