Merge branch 'main' into AddJaegerToCI

ThomsonTan · May 22, 2021 · 0646445 · 0646445
2 parents 1e2f9f7 + 7374de8
commit 0646445
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+# OpenTelemetry Community Code of Conduct
+
+OpenTelemetry follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).