From d2eb4e1889e39f14708d9e5f0f1262a39693fe78936c9cf1ccf8991b77b40130 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Wed, 26 Jun 2019 06:06:01 +0000
Subject: [PATCH] Accepting request 711929 from
 home:dirkmueller:branches:server:monitoring

- Update to version 6.2.5:
  * release 6.2.5
  * Panel: Fully escape html in drilldown links (was only sanitized before)  (#17731)
  * Grafana-CLI: Wrapper for `grafana-cli` within RPM/DEB packages and config/homepath are now global flags (#17695)
  * config: fix connstr for remote_cache (#17675)
  * TablePanel: fix annotations display (#17646)
  * middleware: fix Strict-Transport-Security header (#17644)
  * Elasticsearch: Fix empty query request to send properly (#17488)
  * release 6.2.4
  * grafana-cli: Fix receiving flags via command line (#17617)
  * HTTPServer: Fix X-XSS-Protection header formatting (#17620)
  * release 6.2.3
  * cli: grafana-cli should receive flags from the command line (#17606)
  * AuthProxy: Optimistic lock pattern for remote cache Set (#17485)
  * OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541)
  *  middleware: add security related HTTP(S) response headers (#17522)
  * remote_cache: Fix redis (#17483)
  * auth_proxy: non-negative cache TTL (#17495)

OBS-URL: https://build.opensuse.org/request/show/711929
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=17
---
 _service             |  4 ++--
 _servicedata         |  2 +-
 grafana-6.2.2.tar.xz |  3 ---
 grafana-6.2.5.tar.xz |  3 +++
 grafana.changes      | 22 ++++++++++++++++++++++
 grafana.spec         |  2 +-
 6 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 grafana-6.2.2.tar.xz
 create mode 100644 grafana-6.2.5.tar.xz

diff --git a/_service b/_service
index d67b411..64ebe2d 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/grafana/grafana</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">6.2.2</param>
-    <param name="revision">v6.2.2</param>
+    <param name="versionformat">6.2.5</param>
+    <param name="revision">v6.2.5</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled">
diff --git a/_servicedata b/_servicedata
index 88066ee..aeb40e5 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/grafana/grafana</param>
-    <param name="changesrevision">07540dfdce75cc66b5e9be95a14693d72a19f42c</param>
+    <param name="changesrevision">6082d198252e52205b902798023c56f8ac543772</param>
   </service>
 </servicedata>
\ No newline at end of file
diff --git a/grafana-6.2.2.tar.xz b/grafana-6.2.2.tar.xz
deleted file mode 100644
index 269f118..0000000
--- a/grafana-6.2.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed622c2053c5fd02e6f81e0a89543bbc6bfdcffa756b8cd701124a0ad34d0244
-size 17264016
diff --git a/grafana-6.2.5.tar.xz b/grafana-6.2.5.tar.xz
new file mode 100644
index 0000000..c95602e
--- /dev/null
+++ b/grafana-6.2.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56345df7adf54323468e1f157596c6d7cf423e14cc827752d951c912e6162a19
+size 17357500
diff --git a/grafana.changes b/grafana.changes
index 1f81778..eb9b8b7 100644
--- a/grafana.changes
+++ b/grafana.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jun 25 19:12:43 UTC 2019 - dmueller@suse.com
+
+- Update to version 6.2.5:
+  * release 6.2.5
+  * Panel: Fully escape html in drilldown links (was only sanitized before)  (#17731)
+  * Grafana-CLI: Wrapper for `grafana-cli` within RPM/DEB packages and config/homepath are now global flags (#17695)
+  * config: fix connstr for remote_cache (#17675)
+  * TablePanel: fix annotations display (#17646)
+  * middleware: fix Strict-Transport-Security header (#17644)
+  * Elasticsearch: Fix empty query request to send properly (#17488)
+  * release 6.2.4
+  * grafana-cli: Fix receiving flags via command line (#17617)
+  * HTTPServer: Fix X-XSS-Protection header formatting (#17620)
+  * release 6.2.3
+  * cli: grafana-cli should receive flags from the command line (#17606)
+  * AuthProxy: Optimistic lock pattern for remote cache Set (#17485)
+  * OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541)
+  *  middleware: add security related HTTP(S) response headers (#17522)
+  * remote_cache: Fix redis (#17483)
+  * auth_proxy: non-negative cache TTL (#17495)
+
 -------------------------------------------------------------------
 Sat Jun 15 06:45:19 UTC 2019 - dmueller@suse.com
 
diff --git a/grafana.spec b/grafana.spec
index 193b9ed..884a002 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           grafana
-Version:        6.2.2
+Version:        6.2.5
 Release:        0
 Summary:        Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:        Apache-2.0