This is an automated email from the ASF dual-hosted git repository.

jeffreyh pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/doris-opentelemetry-demo.git

commit 7a87d1029e067008edfbebb2a69b76afef1ad467
Author: Jeffrey <[email protected]>
AuthorDate: Thu Feb 5 10:04:36 2026 +0800

    feat: release doris-app 1.0.1-alpha.2
---
 src/grafana/plugins/doris-app/plugin.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/grafana/plugins/doris-app/plugin.json 
b/src/grafana/plugins/doris-app/plugin.json
index 7d42339..6dd486f 100644
--- a/src/grafana/plugins/doris-app/plugin.json
+++ b/src/grafana/plugins/doris-app/plugin.json
@@ -18,13 +18,8 @@
             "large": "img/logo.svg"
         },
         "screenshots": [],
-<<<<<<< Updated upstream
-        "version": "1.0.1-alpha.1",
-        "updated": "2026-02-02"
-=======
         "version": "1.0.1-alpha.2",
         "updated": "2026-02-04"
->>>>>>> Stashed changes
     },
     "includes": [
         {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to