summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--WHATSNEW.txt5
-rw-r--r--source3/include/version.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d8a754c702..9c4b62a5a1 100644
--- 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 b2e97371b6..c3ed33a300 100644
--- a/source3/include/version.h
+++ b/source3/include/version.h
@@ -1 +1 @@
-#define VERSION "3.0-alpha11"
+#define VERSION "3.0-alpha12"