[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  ed89624 docs: Update Roadmap
      from  23848f3 s3-rpc_server: Use C99 types in rpc_pipes.h

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ed89624896b782525bf75dba5d4b75fa3067e80f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 3 20:10:47 2014 +1200

    docs: Update Roadmap
    
    Change-Id: I336f0c23759ea48fdb2bc3349d8fe19849645fb5
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Wed Jun  4 13:33:05 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 Roadmap |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Roadmap b/Roadmap
index 8f664ec..12b9e8f 100644
--- a/Roadmap
+++ b/Roadmap
@@ -1,24 +1,23 @@
-Copyright (C) 1997-2008 Samba-Team
+Copyright (C) 1997-2014 Samba-Team
 
 The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-Please also look at the Samba3 and Samba4 pages of wiki.samba.org for more
+Please also look at the Release planning pages of wiki.samba.org for more
 information.
 
 The following development objectives for future releases
 are in progress:
 ----------------------------------------------------------------------------
-Samba-3.5.x		This release turned into maintenance mode since we
-			released 3.6.
+Samba-3.6.x		This release turned into security maintenance mode since we
+			released 4.1.
 
-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
+Samba-4.0.x		Our previous release including the AD domain controller
                         feature, the file server and other functionality
                         from Samba 3.6 as well as the new SMB3 protocol.
 
+Samba-4.1.x		Our current release.
+
 
 Note that it is a given that the Samba-Team will continue to track
 Windows releases, ensuring that Samba will work


-- 
Samba Shared Repository