Skip to content

Commit f299ada

Browse files
authored
Merge branch 'main' into hist
2 parents ae3adbb + df3ffc3 commit f299ada

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
137137

138138
- [Aaron Abbott](https://github.com/aabmass), Google
139139
- [Alex Boten](https://github.com/codeboten), Lightstep
140-
- [Srikanth Chekuri](https://github.com/lonewolf3739)
141140
- [Owais Lone](https://github.com/owais), Splunk
142141
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
143142

@@ -147,6 +146,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
147146

148147
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
149148
- [Leighton Chen](https://github.com/lzchen), Microsoft
149+
- [Srikanth Chekuri](https://github.com/srikanthccv)
150150

151151
*For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
152152

dev-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ protobuf~=3.18.1
1717
# See https://github.com/pallets/markupsafe/issues/282
1818
# breaking change introduced in markupsafe causes jinja, flask to break
1919
markupsafe==2.0.1
20+
bleach==4.1.0 # This dependency was updated to a breaking version.

0 commit comments

Comments
 (0)