diff options
| -rw-r--r-- | Documentation/RelNotes/2.30.0.txt | 4 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.30.0.txt b/Documentation/RelNotes/2.30.0.txt index 16955c7e38..0190fa6315 100644 --- a/Documentation/RelNotes/2.30.0.txt +++ b/Documentation/RelNotes/2.30.0.txt @@ -393,3 +393,7 @@ Fixes since v2.29 (merge 7fe07275be js/cmake-extra-built-ins-fix later to maint). (merge 633eebe142 jb/midx-doc-update later to maint). (merge 5885367e8f jh/index-v2-doc-on-fsmn later to maint). + (merge 14639a4779 jc/compat-util-setitimer-fix later to maint). + (merge 56f56ac50b ab/unreachable-break later to maint). + (merge 731d578b4f rb/nonstop-config-mak-uname-update later to maint). + (merge f4698738f9 es/perf-export-fix later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index c3bbcc9cfa..a3871c7b3d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.30.0-rc0 +DEF_VER=v2.30.0-rc1 LF=' ' |