From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 1 Dec 2020 19:25:35 +0000 (-0800)
Subject: Merge branch 'master' of /home/jwagantall/linuxfoundation/onap/IT-21112/sli-adaptors
X-Git-Tag: 1.0.4~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5d2eab72fc4442f14108b41800cec88126913823;p=ccsdk%2Fsli.git

Merge branch 'master' of /home/jwagantall/linuxfoundation/onap/IT-21112/sli-adaptors

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

5d2eab72fc4442f14108b41800cec88126913823
diff --cc version.properties
index ca85875b1,8c043844d..977efc0e3
--- a/version.properties
+++ b/version.properties
@@@ -2,14 -2,13 +2,3 @@@
  # Versioning variables
  # 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
- 
--
--release_name=1
--sprint_number=1
--feature_revision=1
--
--base_version=${release_name}.${sprint_number}.${feature_revision}
--
--release_version=${base_version}
--snapshot_version=${base_version}-SNAPSHOT
--