Code Review
/
so.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
cd5d602
)
update the arch diag for the F release
99/106899/1
author
seshukm
<seshu.kumar.m@huawei.com>
Wed, 15 Apr 2020 08:14:29 +0000
(13:44 +0530)
committer
Seshu Kumar M
<seshu.kumar.m@huawei.com>
Thu, 30 Apr 2020 13:35:43 +0000
(13:35 +0000)
Issue-ID: SO-2730
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: Ic6fe2e0fd824007bc0cbb55eaf1f105794b394dc
version.properties
patch
|
blob
|
history
diff --git
a/version.properties
b/version.properties
index
a0756ad
..
248a45d
100644
(file)
--- a/
version.properties
+++ b/
version.properties
@@
-3,7
+3,11
@@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
+<<<<<<< HEAD (cd5d60 Docker file for NSSMF-ADAPTER)
minor=6
+=======
+minor=7
+>>>>>>> CHANGE (7192a4 update the arch diag for the F release)
patch=0
base_version=${major}.${minor}.${patch}