From 94927428124778e576dc055f747c2735cd7ffcb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 7 Jan 2020 13:43:31 +0100
Subject: [PATCH] CircleCI: Testing upgrade to CircleCI 2.1 (#21374)

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b6c9ded369..1406a2d1e13 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,3 +1,5 @@
+version: 2.1
+
 aliases:
   # Workflow filters
   - &filter-only-release
@@ -14,8 +16,6 @@ aliases:
     branches:
       only: master
 
-version: 2
-
 jobs:
   mysql-integration-test:
     docker:
@@ -1071,7 +1071,6 @@ jobs:
             - $HOME/.cache/trivy
 
 workflows:
-  version: 2
   build-master:
     jobs:
       - build-all: