Update CHANGELOG, compliance-matrix.

open-telemetry · Jan 15, 2021 · 950f8c2 · 950f8c2
1 parent 076da8d
commit 950f8c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -109,6 +109,9 @@ Updates:
   ([#993](https://github.com/open-telemetry/opentelemetry-specification/pull/993))
 - Trace API: Clarifications for `Span.End`, e.g. IsRecording becomes false after End
   ([#1011](https://github.com/open-telemetry/opentelemetry-specification/pull/1011))
+- Resource SDK: Reverse (suggested) order of Resource.Merge parameters, remove
+  special case for empty strings
+  ([#????](https://github.com/open-telemetry/opentelemetry-specification/pull/????))
 
 ## v0.6.0 (07-01-2020)
 

diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md
@@ -83,7 +83,7 @@ status of the feature is not known.
 |----------------------------------------------|---|----|---|------|----|------|---|----|---|----|
 |Create from Attributes                        | + | +  | + | +    | +  |      |   |    |   |    |
 |Create empty                                  | + | +  | + | +    | +  |      |   |    |   |    |
-|Merge                                         | + | +  | + | +    | +  |      |   |    |   |    |
+|Merge (v2)                                    |   |    |   |      |    |      |   |    |   |    |
 |Retrieve attributes                           | + | +  | + | +    | +  |      |   |    |   |    |
 
 ## Context Propagation