[SCM] Samba Shared Repository - branch v4-12-test updated

[Karolin Seeger]

The branch, v4-12-test has been updated
       via  75977baa43e VERSION: Bump version up to 4.12.0rc3...
       via  b017377c930 VERSION: Disable GIT_SNAPSHOT for the 4.12.0rc2 release.
       via  74b22159448 WHATSNEW: Add release notes for Samba 4.12.0rc2.
       via  f17d3edbb64 script/release.sh: Don't use quotations any longer.
      from  7b1be793de0 s4:torture: Skip the deltest20 as user root

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


- Log -----------------------------------------------------------------
commit 75977baa43eda4160515813839f4d79b1b6f7878
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Feb 4 11:09:35 2020 +0100

    VERSION: Bump version up to 4.12.0rc3...
    
    and re-enable GIT_SNAPSHOT.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit b017377c930bd0d8e8d9ae6814cc5755c69842fd
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Feb 4 11:08:41 2020 +0100

    VERSION: Disable GIT_SNAPSHOT for the 4.12.0rc2 release.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit 74b22159448c0e82886c03318aec6cffaa465003
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Feb 4 11:08:05 2020 +0100

    WHATSNEW: Add release notes for Samba 4.12.0rc2.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>

commit f17d3edbb6414c104687baa19d5dff9f47b55013
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jan 28 11:48:53 2020 +0100

    script/release.sh: Don't use quotations any longer.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(master): Mon Feb  3 12:45:39 UTC 2020 on sn-devel-184
    
    (cherry picked from commit f699df32cdbae4fbc585c259828029c74163323b)

-----------------------------------------------------------------------

Summary of changes:
 VERSION           |  2 +-
 WHATSNEW.txt      | 13 ++++++++++++-
 script/release.sh | 26 --------------------------
 3 files changed, 13 insertions(+), 28 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 78a4c77be70..2e3b9b6b2fb 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=2
+SAMBA_VERSION_RC_RELEASE=3
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 0854a63e1c7..ba464ef8dd0 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
 Release Announcements
 =====================
 
-This is the first release candidate of Samba 4.12.  This is *not*
+This is the second release candidate of Samba 4.12.  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/.
@@ -151,6 +151,17 @@ smb.conf changes
   rndc command                       Removed
   write cache size                   Removed
 
+
+CHANGES SINCE 4.12.0rc1
+=======================
+
+o  Jeremy Allison <jra at samba.org>
+   * BUG 14239: s3: lib: nmblib. Clean up and harden nmb packet processing.
+
+o  Andreas Schneider <asn at samba.org>
+   * BUG 14253: lib:util: Log mkdir error on correct debug levels.
+
+
 KNOWN ISSUES
 ============
 
diff --git a/script/release.sh b/script/release.sh
index 6c3ba0d4add..507d5931a6a 100755
--- a/script/release.sh
+++ b/script/release.sh
@@ -193,26 +193,6 @@ verify_samba_stable() {
 
 	load_samba_stable_versions
 
-	test x"${product}" = x"samba-stable" && {
-		test -f "announce.${tagname}.quotation.txt" || {
-			echo ""
-			echo "announce.${tagname}.quotation.txt missing!"
-			echo ""
-			echo "Please create it and retry"
-			echo ""
-			echo "The content should look like this:"
-			echo "cat announce.${tagname}.quotation.txt"
-			echo '======================================================'
-			echo '                "Some text'
-			echo '                 from someone."'
-			echo ''
-			echo '                 The author'
-			echo '======================================================'
-			echo ""
-			return 1
-		}
-	}
-
 	test -n "${oldtagname}" || {
 		return 0
 	}
@@ -793,11 +773,6 @@ announcement_samba_stable() {
 		return 1
 	}
 
-	test -f "announce.${tagname}.quotation.txt" || {
-		echo "announce.${tagname}.quotation.txt missing!"
-		return 1
-	}
-
 	local release_url="${download_url}samba/stable/"
 	local patch_url="${download_url}samba/patches/"
 
@@ -840,7 +815,6 @@ announcement_samba_stable() {
 		local headlimit=$(expr ${top} - 1 )
 		local taillimit=$(expr ${headlimit} - \( ${skip} - 1 \))
 
-		cat "announce.${tagname}.quotation.txt"
 		echo ""
 		echo ""
 		echo "Release Announcements"


-- 
Samba Shared Repository