Code

Resource merge precedence#1728

Code

Merged

cijothomas merged 12 commits intoopen-telemetry:mainopen-telemetry/opentelemetry-dotnet:mainfrom Austin-Tan:ResourceMergePrecedenceCopy head branch name to clipboardJan 28, 2021

+23-19

Commits

Commits on Jan 26, 2021

• Reversing this versus other in merge priority

  Austin-Tan

  committed
  2b51171

  Copy full SHA for 2b51171

Commits on Jan 27, 2021

• revised test for new behavior

  Austin-Tan

  committed
  67a938d

  Copy full SHA for 67a938d

• Merge branch 'master' of https://github.com/open-telemetry/opentelemetry-dotnet into ResourceMergePrecedence

  Austin-Tan

  committed
  0ec6586

  Copy full SHA for 0ec6586

• Changelog updated

  Austin-Tan

  committed
  15a205d

  Copy full SHA for 15a205d

• Merge branch 'master' into ResourceMergePrecedence

  cijothomas

  authored
  c303d38

  Copy full SHA for c303d38

• Changelog updated

  Austin-Tan

  committed
  ddcf139

  Copy full SHA for ddcf139

• remove extra period

  Austin-Tan

  committed
  a5706df

  Copy full SHA for a5706df

• Merge branch 'ResourceMergePrecedence' of https://github.com/Austin-Tan/opentelemetry-dotnet into ResourceMergePrecedence

  Austin-Tan

  committed
  a9132e6

  Copy full SHA for a9132e6

• Fixing more period issues/line breaks

  Austin-Tan

  committed
  aa0bcc0

  Copy full SHA for aa0bcc0

• Merge branch 'master' into ResourceMergePrecedence

  cijothomas

  authored
  313de3e

  Copy full SHA for 313de3e

• Merge branch 'main' into ResourceMergePrecedence

  cijothomas

  authored
  0050c1b

  Copy full SHA for 0050c1b

• Merge branch 'main' into ResourceMergePrecedence

  cijothomas

  authored
  e243982

  Copy full SHA for e243982