Skip to content

Resource merge precedence #1728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cijothomas merged 12 commits into from
Jan 28, 2021
Merged

Resource merge precedence #1728

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2b51171
Reversing this versus other in merge priority
Austin-Tan Jan 26, 2021
67a938d
revised test for new behavior
Austin-Tan Jan 27, 2021
0ec6586
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
Austin-Tan Jan 27, 2021
15a205d
Changelog updated
Austin-Tan Jan 27, 2021
c303d38
Merge branch 'master' into ResourceMergePrecedence
cijothomas Jan 27, 2021
ddcf139
Changelog updated
Austin-Tan Jan 27, 2021
a5706df
remove extra period
Austin-Tan Jan 27, 2021
a9132e6
Merge branch 'ResourceMergePrecedence' of https://github.com/Austin-T…
Austin-Tan Jan 27, 2021
aa0bcc0
Fixing more period issues/line breaks
Austin-Tan Jan 27, 2021
313de3e
Merge branch 'master' into ResourceMergePrecedence
cijothomas Jan 27, 2021
0050c1b
Merge branch 'main' into ResourceMergePrecedence
cijothomas Jan 27, 2021
e243982
Merge branch 'main' into ResourceMergePrecedence
cijothomas Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into ResourceMergePrecedence
  • Loading branch information
@cijothomas
cijothomas authored Jan 27, 2021
commit 313de3e2f5664c2c411fd8e517061a0b66df3392

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.