From 79b5636be43054a0c2ec7ab2450edc347e1d5043 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Wed, 6 Jan 2021 15:34:58 +0000
Subject: Merge clamp master into tosca-poc branch

This change mreges changes in  clamp master into the tosca-poc branch
because the two banches have diverged.

Issue-ID: POLICY-2971
Change-Id: Iea4efe90204c98eeaae0b112ad5c964f722afdb0
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'version.properties')

diff --git a/version.properties b/version.properties
index f00cc8171..35775d32e 100644
--- a/version.properties
+++ b/version.properties
@@ -25,9 +25,9 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=5
-minor=1
-patch=1
+major=6
+minor=0
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
-- 
cgit 1.2.3-korg