diff --git a/lerna.json b/lerna.json index 5a408752737..efcd24a7134 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], - "version": "7.1.2" + "version": "7.1.3" } diff --git a/package.json b/package.json index 3b10c821a42..15c93d1a8e1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "private": true, "name": "grafana", - "version": "7.1.2", + "version": "7.1.3", "repository": "github:grafana/grafana", "scripts": { "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index af5a76ef305..ec9ca22f14a 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/data", - "version": "7.1.2", + "version": "7.1.3", "description": "Grafana Data Library", "keywords": [ "typescript" diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 37aa099f83c..93d24e503d8 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/e2e-selectors", - "version": "7.1.2", + "version": "7.1.3", "description": "Grafana End-to-End Test Selectors Library", "keywords": [ "cli", diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index c9df12f9b2c..7705731ed97 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/e2e", - "version": "7.1.2", + "version": "7.1.3", "description": "Grafana End-to-End Test Library", "keywords": [ "cli", @@ -45,7 +45,7 @@ "types": "src/index.ts", "dependencies": { "@cypress/webpack-preprocessor": "4.1.3", - "@grafana/e2e-selectors": "7.1.2", + "@grafana/e2e-selectors": "7.1.3", "@grafana/tsconfig": "^1.0.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", "blink-diff": "1.0.13", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index d1099d89c56..a2dc05eeb65 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/runtime", - "version": "7.1.2", + "version": "7.1.3", "description": "Grafana Runtime Library", "keywords": [ "grafana", @@ -23,8 +23,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@grafana/data": "7.1.2", - "@grafana/ui": "7.1.2", + "@grafana/data": "7.1.3", + "@grafana/ui": "7.1.3", "systemjs": "0.20.19", "systemjs-plugin-css": "0.1.37" }, diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index bdb2afc1d5c..4d891d261de 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/toolkit", - "version": "7.1.2", + "version": "7.1.3", "description": "Grafana Toolkit", "keywords": [ "grafana", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 6f8e93a1f2c..187b5145918 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/ui", - "version": "7.1.2", + "version": "7.1.3", "description": "Grafana Components Library", "keywords": [ "grafana", @@ -28,8 +28,8 @@ }, "dependencies": { "@emotion/core": "^10.0.27", - "@grafana/data": "7.1.2", - "@grafana/e2e-selectors": "7.1.2", + "@grafana/data": "7.1.3", + "@grafana/e2e-selectors": "7.1.3", "@grafana/slate-react": "0.22.9-grafana", "@grafana/tsconfig": "^1.0.0-rc1", "@iconscout/react-unicons": "^1.0.0", diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index faaf1b0dcea..c023b7887e3 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -1,6 +1,6 @@ { "name": "@jaegertracing/jaeger-ui-components", - "version": "7.1.2", + "version": "7.1.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -14,8 +14,8 @@ "typescript": "3.9.3" }, "dependencies": { - "@grafana/data": "7.1.2", - "@grafana/ui": "7.1.2", + "@grafana/data": "7.1.3", + "@grafana/ui": "7.1.3", "@types/classnames": "^2.2.7", "@types/deep-freeze": "^0.1.1", "@types/hoist-non-react-statics": "^3.3.1", diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json index cd90c3f55f9..88b1be510b8 100644 --- a/plugins-bundled/internal/input-datasource/package.json +++ b/plugins-bundled/internal/input-datasource/package.json @@ -1,6 +1,6 @@ { "name": "@grafana-plugins/input-datasource", - "version": "7.1.2", + "version": "7.1.3", "description": "Input Datasource", "private": true, "repository": { @@ -16,9 +16,9 @@ "author": "Grafana Labs", "license": "Apache-2.0", "devDependencies": { - "@grafana/data": "7.1.2", - "@grafana/toolkit": "7.1.2", - "@grafana/ui": "7.1.2" + "@grafana/data": "7.1.3", + "@grafana/toolkit": "7.1.3", + "@grafana/ui": "7.1.3" }, "volta": { "node": "12.16.2" diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts index a1708f8730e..84dc6708872 100644 --- a/public/app/features/templating/template_srv.ts +++ b/public/app/features/templating/template_srv.ts @@ -243,6 +243,7 @@ export class TemplateSrv implements BaseTemplateSrv { case 'date': { return this.formatDate(value, args); } + default: case 'glob': { if (_.isArray(value) && value.length > 1) { return '{' + value.join(',') + '}';