Merge branch 'ld/p4-unshelve'

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b4fb7d9a39f39513d3c29004f470920865b3f9ec..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-rc1
+DEF_VER=v2.18.0-rc0
 
 LF='
 '