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

[productcatalog] - allow products to be extended #1363

Merged
merged 10 commits into from
Feb 9, 2024
+62 −27
Merged

[productcatalog] - allow products to be extended #1363

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a52d06a
allow products to be extended
puckpuck Feb 2, 2024
aebd455
allow products to be extended
puckpuck Feb 2, 2024
ad9edc0
fix products path
puckpuck Feb 2, 2024
1850114
Merge branch 'main' into productcatalog.extendable-products
puckpuck Feb 2, 2024
df2b3d3
fix merge conflict
puckpuck Feb 2, 2024
48a49fd
Merge branch 'main' into productcatalog.extendable-products
puckpuck Feb 2, 2024
389c6ea
Merge branch 'main' into productcatalog.extendable-products
puckpuck Feb 5, 2024
d315244
Merge branch 'main' into productcatalog.extendable-products
julianocosta89 Feb 7, 2024
6ad0c87
Merge branch 'main' into productcatalog.extendable-products
puckpuck Feb 7, 2024
894f5fb
Merge branch 'main' into productcatalog.extendable-products
puckpuck Feb 9, 2024
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 'main' into productcatalog.extendable-products
@julianocosta89
julianocosta89 authored Feb 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit d31524480c554bd918c262631edffa3ea2290675
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,8 @@ the release.
([#1357](https://github.com/open-telemetry/opentelemetry-demo/pull/1357))
* Update Python SDKs
([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))
* [loadgenerator] fix browser traffic enabled flag
([#1359](https://github.com/open-telemetry/opentelemetry-demo/pull/1359))
* [productcatalog] allow products to be extended
([#1363](https://github.com/open-telemetry/opentelemetry-demo/pull/1363))

You are viewing a condensed version of this merge commit. You can view the full changes here.