preparing for release of 3.0-alpha12

(This used to be commit 9542b0a42cf0c51c171d50e825665245584ac87d)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d8a754c70283a790b81e20b0e5faecae2e665e7a..9c4b62a5a1bffc9acc2a96b2dee37c7799195bec 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,11 @@
               WHATS NEW IN Samba 3.0 alphaX
               =============================
 
+Changes in alpha12
+- doc updates (jerry)
+- store domain sid on ADS join (tridge)
+- allow a winbind username on ADS connection (tridge)
+
 Changes in alpha11
 - fixed fallback to "ads server" option (tridge)
 - fix ACL failure on HP HFS (jra)

diff --git a/source3/include/version.h b/source3/include/version.h
index b2e97371b68d5f74459428109a5361a4ddd935fa..c3ed33a300c8e59fbbb7b294061dd6ffae63507d 100644 (file)
--- a/source3/include/version.h
+++ b/source3/include/version.h
@@ -1 +1 @@
-#define VERSION "3.0-alpha11"
+#define VERSION "3.0-alpha12"