Skip to content

Commit

Permalink
Merge branch 'main' into release/v1.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
seemk authored Nov 15, 2023
2 parents 13e471a + 4601d36 commit 2898670
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
50 changes: 25 additions & 25 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ splk-py-trace-bootstrap = 'splunk_otel.cmd.bootstrap:run_deprecated'
splunk_distro = "splunk_otel.distro:_SplunkDistro"

[tool.poetry.dependencies]
cryptography=">=2.0,<=41.0.4"
cryptography=">=2.0,<=41.0.5"
python = "^3.7.2"
protobuf = "^4.23"
opentelemetry-api = "1.20.0"
Expand Down

0 comments on commit 2898670

Please sign in to comment.