Skip to content
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

Jump to bottom

Rename otel/label -> otel/attribute #1541

Merged
merged 11 commits into from
Feb 18, 2021
Merged

Rename otel/label -> otel/attribute #1541

merged 11 commits into from
Feb 18, 2021

Commits on Feb 16, 2021

  1. Rename otel/label -> otel/attr 

    Leave the imported name alone, to avoid a large diff and conflicts
    @punya
    punya committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    0bda6c1 View commit details
    Browse the repository at this point in the history

  2. Better import comment

    @punya
    punya committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    65a4871 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md 

    Co-authored-by: Tyler Yahn <[email protected]>
    @punya @MrAlias
    punya and MrAlias authored Feb 16, 2021
    Configuration menu
    Copy the full SHA
    b9ecfcd View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2021

  1. Merge remote-tracking branch 'origin/main' into label-to-attr

    @punya
    punya committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    adcb523 View commit details
    Browse the repository at this point in the history

  2. otel/attr -> otel/attribute

    @punya
    punya committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    54c6bd4 View commit details
    Browse the repository at this point in the history

  3. Missed the changelog entry

    @punya
    punya committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    71f7719 View commit details
    Browse the repository at this point in the history

  4. Get rid of import renaming

    @punya
    punya committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    f75db34 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' into label-to-attr

    @punya
    punya committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    303a440 View commit details
    Browse the repository at this point in the history

  6. Merge remaining conflicts

    @punya
    punya committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    40b1372 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Merge remote-tracking branch 'origin/main' into label-to-attr

    @punya
    punya committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    fcfb881 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into label-to-attr

    @Aneurysm9
    Aneurysm9 authored Feb 18, 2021
    Configuration menu
    Copy the full SHA
    4ee7baf View commit details
    Browse the repository at this point in the history