From 354789edc94b2e5e26967d2d7a46180f5f53c9e6 Mon Sep 17 00:00:00 2001 From: Alexander Emelin Date: Sat, 3 Jul 2021 00:46:48 +0300 Subject: [PATCH] update option description to only commit to wildcard symbol for now (#36341) (cherry picked from commit 012ee1fc2816ce142dcbdbf37dd8d916f044eabd) --- conf/defaults.ini | 2 +- conf/sample.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 629e4b2c67f..6b2990dbb42 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -903,7 +903,7 @@ plugin_catalog_url = https://grafana.com/grafana/plugins/ max_connections = 100 # allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live. -# If not set then origin will be matched over root_url. Supports globbing: see https://github.com/gobwas/glob. +# If not set then origin will be matched over root_url. Supports wildcard symbol "*". allowed_origins = # engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in diff --git a/conf/sample.ini b/conf/sample.ini index 43ef261f9f4..594892c1f58 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -889,7 +889,7 @@ ;max_connections = 100 # allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live. -# If not set then origin will be matched over root_url. Supports globbing: see https://github.com/gobwas/glob. +# If not set then origin will be matched over root_url. Supports wildcard symbol "*". ;allowed_origins = # engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in