ctdb-ipalloc: Drop remote IP verification

[sharpe/samba-autobuild/.git] / Roadmap

diff --git a/Roadmap b/Roadmap
index baeed630a1c60b118ec340d822df6a4ca978222b..96b80524707a0d1709c4fb7c5a84d5623b4f81c0 100644 (file)
--- a/Roadmap
+++ b/Roadmap
@@ -1,30 +1,24 @@
-Copyright (C) 1997 - Samba-Team
+Copyright (C) 1997-2015 Samba-Team
 
-The Samba-Team are committed to an agressive program to deliver quailty
+The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-The current Samba release 1.9.17 is called the "Browse Fix Release"
-The following development objectives are in place:
+Please also look at the Release planning pages of wiki.samba.org for more
+information.
 
-Version        / Codename      Notes
-------------------     ----------------------------------------------------
-1.9.18                         This version will feature two main areas of improvement
-"Perf-Lock Release"    - introduction of OpLock support
-                       - introduction of new browse list and WINS methods
+The following development objectives for future releases
+are in progress:
+----------------------------------------------------------------------------
+Samba-4.0.x            This release turned into security maintenance mode
+                       since we released 4.2.
 
-1.9.19                 An authentication update release to offer improved
-"Auth Code Release"    security and password synchronisation capabilities
+Samba-4.1.x            Our previous release including the AD domain
+                       controller feature, the file server and other
+                       functionality from Samba 4.0.
 
-1.9.20                 Introduction of new managment tools
-"GUI Config Release"   Improved multi-language support.
+Samba-4.2.x            Our current release.
 
-2.0                    The next generation Directory Services update
-"DSA Release"
-
-While no release date or content promises are made we are hoping to release
-the remainder of the 1.9 series relases within short time frame.
-
-Should a budding contributor spring into gear and deliver any of the above
-ahead of the above release sequence then we reserve the option to make an
-out of sequence release (but always keeping to a logical sequence code number).
 
+Note that it is a given that the Samba-Team will continue to track
+Windows releases, ensuring that Samba will work
+well with whatever releases Redmond throws our way :-).