resolve conflicts and add changelog

Signed-off-by: Ben Ye <ben.ye@bytedance.com>
thanos-io · Nov 6, 2021 · 8ef1422 · 8ef1422
1 parent 052bb7f
commit 8ef1422
Show file tree

Hide file tree

Showing 4 changed files with 39,446 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#4764](https://github.com/thanos-io/thanos/pull/4764) Compactor: add `block-viewer.global.sync-block-timeout` flag to set the timeout of synchronization block metas.
 - [#4801](https://github.com/thanos-io/thanos/pull/4801) Compactor: added Prometheus metrics for tracking the progress of compaction and downsampling.
 - [#4444](https://github.com/thanos-io/thanos/pull/4444) UI: add mark deletion and no compaction to the Block UI.
+- [#4576](https://github.com/thanos-io/thanos/pull/4576) UI: add filter compaction level to the Block UI.
 
 ### Fixed
 

diff --git a/pkg/ui/bindata.go b/pkg/ui/bindata.go