diff options
author | liamfallon <liam.fallon@est.tech> | 2021-01-06 15:34:58 +0000 |
---|---|---|
committer | S�bastien Determe <sebastien.determe@intl.att.com> | 2021-01-06 18:36:04 +0000 |
commit | 79b5636be43054a0c2ec7ab2450edc347e1d5043 (patch) | |
tree | 5c1947c4f0639e0d1c4816fe841d286677a31637 /version.properties | |
parent | b6d7a6d192eddc0c52497603023e47f10599c2ae (diff) |
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>
Diffstat (limited to 'version.properties')
-rw-r--r-- | version.properties | 6 |
1 files changed, 3 insertions, 3 deletions
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} |