summaryrefslogtreecommitdiffstats
path: root/Roadmap
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-04 09:24:52 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-09-04 09:31:49 +1000
commit8be652a675efb5f25f0e2c573b9c8d6c0f3a9b5f (patch)
tree48a487a50fb3929338acf9050dfdf93102e9cc53 /Roadmap
parent3f42619e802b9dc13dc4dd770d419a0e4e9fce9d (diff)
downloadsamba-8be652a675efb5f25f0e2c573b9c8d6c0f3a9b5f.tar.gz
samba-8be652a675efb5f25f0e2c573b9c8d6c0f3a9b5f.tar.xz
samba-8be652a675efb5f25f0e2c573b9c8d6c0f3a9b5f.zip
docs: Update Roadmap
Diffstat (limited to 'Roadmap')
-rw-r--r--Roadmap8
1 files changed, 4 insertions, 4 deletions
diff --git a/Roadmap b/Roadmap
index 975ca7b29b..8f664ece1a 100644
--- a/Roadmap
+++ b/Roadmap
@@ -9,15 +9,15 @@ information.
The following development objectives for future releases
are in progress:
----------------------------------------------------------------------------
-Samba-3.0.x This release turned into maintenance mode since we
- released 3.2.
+Samba-3.5.x This release turned into maintenance mode since we
+ released 3.6.
Samba-3.6.x This is the current stable Samba 3 release intended
for all Samba production server.
Samba-4.0 Our next release including the AD domain controller
- feature, and the file server and other functionality
- from Samba 3.6.
+ feature, the file server and other functionality
+ from Samba 3.6 as well as the new SMB3 protocol.
Note that it is a given that the Samba-Team will continue to track