Merge commit 'origin/v3-2-test' into v3-2-stable

Conflicts:

	WHATSNEW.txt

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 76a66b3d297910ff484999d6b403514da9be3afd..2ac227d141ffcb696d58d92e94b637bdf7c1c658 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -43,7 +43,7 @@ Major enhancements in Samba 3.2.0 include:
 
 
   Documentation:
-  o Inclusion of an HTLM version of the 3rd edition of "Using Samba"
+  o Inclusion of an HTML version of the 3rd edition of "Using Samba"
     from O'Reilly Publishing.
 
 
@@ -122,6 +122,7 @@ smb.conf changes
     ldap debug level                   New             0
     ldap debug threshold               New             10
     mangle map                         Removed
+    min receive file size              New             0
     open files database hashsize       Removed
     read bmpx                          Removed                         
     registry shares                    New             No
@@ -195,7 +196,7 @@ o   Steve Langasek <vorlon@debian.org>
       for better adherence to the FHS standard.
 
 
-o  Volker Lendecke <vl@samba.org>
+o   Volker Lendecke <vl@samba.org>
     * Add talloc_stackframe() and talloc_pool() features.
     * Removal of pstring data type.
     * Add generic a in-memory cache.
@@ -210,13 +211,13 @@ o  Volker Lendecke <vl@samba.org>
 
 
 o   Stefan Metzmacher <metze@samba.org>
-    * Fixes for libreplace.
+    * Refactor Winbind internal parent-child interface tables
+      to achieve better unit testing support.
+    * Add nss_wrapper API for local Winbind unit tests.
+    * Networking fixes to the libreplace library.
     * Pidl fixes.
+    * Remove unused Winbind pipe calls.
     * Build fixes.
-    * Add nss_wrapper support.
-    * Start and test winbindd by 'make test'.
-    * Split up child_dispatch_table into domain, idmap and locator tables
-      in winbindd.
     * Fix for a crash bug in pidl generated client code.
       This could have happend with [in,out,unique] pointers
       when the client sends a valid pointer, but the server
@@ -239,7 +240,6 @@ o   Andreas Schneider <anschneider@suse.de>
     * Don't restart winbind if a corrupted tdb is found during
       initialization.
     * Fix Windows 2008 (Longhorn) join.
-    * Fix crashbug in winbindd.
     * Add share parameter "hidden".
 
 

diff --git a/source/VERSION b/source/VERSION
index c97db4b04eedc33d90cda0129b3e8f88db7cca63..f0883b95bb0213ede89eec478c07777d37dd448c 100644 (file)
--- a/source/VERSION
+++ b/source/VERSION
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="test"
+SAMBA_VERSION_VENDOR_SUFFIX="stable"
 SAMBA_VERSION_VENDOR_PATCH=