Merge branch 'master' into ingester_kafka_consumer_protocol_version_c…

…onfig
jaegertracing · Jun 28, 2019 · a9def7d · a9def7d
2 parents c70f284 + 3c78819
commit a9def7d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,21 @@ Changes by Version
 
 #### UI Changes
 
+1.13.1 (2019-06-28)
+------------------
+
+#### Backend Changes
+
+##### Breaking Changes
+
+##### New Features
+
+##### Bug fixes, Minor Improvements
+
+Change default for bearer-token-propagation to false ([#1642](https://github.com/jaegertracing/jaeger/pull/1642), [@wsoula](https://github.com/wsoula))
+
+#### UI Changes
+
 1.13.0 (2019-06-27)
 ------------------
 

diff --git a/cmd/query/app/flags.go b/cmd/query/app/flags.go
@@ -50,7 +50,7 @@ func AddFlags(flagSet *flag.FlagSet) {
 	flagSet.String(queryBasePath, "/", "The base path for all HTTP routes, e.g. /jaeger; useful when running behind a reverse proxy")
 	flagSet.String(queryStaticFiles, "", "The directory path override for the static assets for the UI")
 	flagSet.String(queryUIConfig, "", "The path to the UI configuration file in JSON format")
-	flagSet.Bool(queryTokenPropagation, true, "Allow propagation of bearer token to be used by storage plugins")
+	flagSet.Bool(queryTokenPropagation, false, "Allow propagation of bearer token to be used by storage plugins")
 
 }