From aaa03218a4ee54848bffebc01536c13857cf95ed Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Mon, 11 Apr 2011 21:56:29 +0200
Subject: [PATCH] WHATSNEW: Start to add changes since 3.6.0pre1.

To be completed...

Karolin
(cherry picked from commit 84b726154ef5cdcb00cbfbf7bc3ae607d6857765)
---
 WHATSNEW.txt | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1e6f998209b..50d9cff927a 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,10 +1,10 @@
                    =================================
-                   Release Notes for Samba 3.6.0pre1
-                             July 28, 2010
+                   Release Notes for Samba 3.6.0pre2
+                            April 12, 2010
                    =================================
 
 
-This is the first preview release of Samba 3.6.  This is *not*
+This is the second preview release of Samba 3.6.0.  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/.
@@ -207,6 +207,60 @@ smb.conf changes
    winbind max clients		       New	       200
 
 
+Commit Highlights
+-----------------
+
+
+
+
+Changes since 3.6.0pre1
+-----------------------
+
+o   Michael Adam <obnox@samba.org>
+    * IDmapping changes.
+
+
+o   Jeremy Allison <jra@samba.org>
+    * BUG 7080: Quota only shown when logged as root.
+    * BUG 7996: Sgid bit lost on folder rename.
+    * BUG 8040: Fix smbclient segfault with Cyrillic netbios names.
+    * Fix crash bug on smbd shutdown when using FOPENDIR().
+
+
+o   Günther Deschner <gd@samba.org>
+    * Fix Coverity ID 2041.
+    * fix potential crash bug in spoolss_PrinterEnumValues push path.
+
+
+o   David Disseldorp <ddiss@suse.de>
+    * BUG 8040: Fix smbclient segfault with Cyrillic netbios names.
+    * Fix memory leak in print_cups.c.
+    * Remove duplicate cups response processing code.
+
+
+o   Björn Jacke <bj@sernet.de>
+    * BUG 8033: Add explicit configure option whether or not to enable dmapi
+      support.
+
+
+o   Volker Lendecke <vl@samba.org>
+    * BUG 8009: Fix getting username in 'net rap session'.
+    * BUG 8010: Use jenkins hash for str_checksum.
+    * BUG 8042: Fix file creation on OS/X.
+    * Fix numerous Coverity IDs.
+
+
+o   Nikolay Martynov <mar.kolya@gmail.com>
+    * BUG 8010: Fix inode generation so nautilus can count total dir size
+      correctly.
+
+
+o   Stefan Metzmacher <metze@samba.org>
+    * BUG 7567: Fix printing from Windows 7.
+    * Don't grant SEC_STD_DELETE always to the owner of a file.
+
+
+
 ######################################################################
 Reporting bugs & Development Discussion
 #######################################
-- 
2.11.4.GIT