Merge branch 'vv/merge-squash-with-explicit-commit' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1d4886b37223324f78b00c5f7ab0847b85aabce0..67f86b3e678b20ed2558ae6350b3d8138c88d28d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.21.0-rc0
+DEF_VER=v2.22.0
 
 LF='
 '