[SCM] Samba Shared Repository - branch v4-21-stable updated

[Jule Anger]

The branch, v4-21-stable has been updated
       via  729078d20cf VERSION: Disable GIT_SNAPSHOT for the Samba 4.21.0rc1 release.
       via  33f3cd3f0bc WHATSNEW: Up to Samba 4.21.0rc1.
       via  93a6656c13f tdb: version 1.4.11
      from  e58e4a5aa99 ldb:kv_index: use subtransaction_cancel in transaction_cancel

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-stable


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                          | 6 +++---
 WHATSNEW.txt                                     | 2 +-
 lib/tdb/ABI/{tdb-1.3.17.sigs => tdb-1.4.11.sigs} | 0
 lib/tdb/wscript                                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 copy lib/tdb/ABI/{tdb-1.3.17.sigs => tdb-1.4.11.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index eaa8dddbf66..57dceb79676 100644
--- a/VERSION
+++ b/VERSION
@@ -79,7 +79,7 @@ SAMBA_VERSION_BETA_RELEASE=
 # e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
 #  ->  "2.2.9pre1"                                     #
 ########################################################
-SAMBA_VERSION_PRE_RELEASE=1
+SAMBA_VERSION_PRE_RELEASE=
 
 ########################################################
 # For 'rc' releases the version will be                #
@@ -89,7 +89,7 @@ SAMBA_VERSION_PRE_RELEASE=1
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=
+SAMBA_VERSION_RC_RELEASE=1
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
@@ -101,7 +101,7 @@ SAMBA_VERSION_RC_RELEASE=
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
 #  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 
 ########################################################
 # This is for specifying a release nickname            #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7e283f6031a..99f9f0aa7a6 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
 Release Announcements
 =====================
 
-This is the first pre release of Samba 4.21.  This is *not*
+This is the first release candidate of Samba 4.21.  This is *not*
 intended for production environments and is designed for testing
 purposes only.  Please report any defects via the Samba bug reporting
 system at https://bugzilla.samba.org/.
diff --git a/lib/tdb/ABI/tdb-1.3.17.sigs b/lib/tdb/ABI/tdb-1.4.11.sigs
similarity index 100%
copy from lib/tdb/ABI/tdb-1.3.17.sigs
copy to lib/tdb/ABI/tdb-1.4.11.sigs
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 04121498723..234a66f6878 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tdb'
-VERSION = '1.4.10'
+VERSION = '1.4.11'
 
 import sys, os
 


-- 
Samba Shared Repository