Merge branch 'main' into hist

open-telemetry · Apr 11, 2022 · f299ada · f299ada
2 parents ae3adbb + df3ffc3
commit f299ada
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -137,7 +137,6 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 
 - [Aaron Abbott](https://github.com/aabmass), Google
 - [Alex Boten](https://github.com/codeboten), Lightstep
-- [Srikanth Chekuri](https://github.com/lonewolf3739)
 - [Owais Lone](https://github.com/owais), Splunk
 - [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
 
@@ -147,6 +146,7 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
 
 - [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
+- [Srikanth Chekuri](https://github.com/srikanthccv)
 
 *For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -17,3 +17,4 @@ protobuf~=3.18.1
 # See https://github.com/pallets/markupsafe/issues/282
 # breaking change introduced in markupsafe causes jinja, flask to break
 markupsafe==2.0.1
+bleach==4.1.0 # This dependency was updated to a breaking version.