Merge branch 'js/rebase-recreate-merge'

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 067e9e7f4440a4a4a6f0dda6875fd3f840e694de..bdd758e40951273e71bbae2fd69c2104c85cfd3d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.17.0-rc0
+DEF_VER=v2.18.0-rc0
 
 LF='
 '