Samba Release Planning
Samba Release Planning and Supported Release Lifetime
Future Development Roadmap
As each item, and parts of each item on Samba's future development is completed, the features are landed in the master branch, for inclusion in the next stable release of Samba. Development in master is ongoing, in parallel to our stable releases, and new features always land on master first.
The regular Samba release cycle intends a new release series every six month. Each release series then enters into maintenance mode when the next major release version (4.x.0) comes out as the new current stable release series. For your convenience, the next to last series will be turned into a security fixes only mode. Beyond this point, the series is discontinued (EOL).
That means, a series is
- six months fully supported,
- another six months in the maintenance mode,
- six months in the security fixes only mode.
In total, each series is maintained for a period of approximately 18 months.
If 4.2 is the current release series, then 4.1 would be in maintenance mode, 4.0 would be in the security fixes only mode, and finally the support of 3.6 would be stopped with the release of 4.2.0.
Each series can have any number of desired minor release. These will be released usually every 6 weeks.
|series||git branch||status||started||maintenance||security||discontinued (EOL)|
|4.4 (details)||master||new upcoming release series|
|4.3 (details)||v4-3-test||current stable release series||2015-09-08|
|4.2 (details)||v4-2-test||maintenance mode||2015-03-04||2015-09-08|
|4.1 (details)||v4-1-test||security fixes only||2013-10-11||2015-03-04||2015-09-08|
|4.0 (details)||v4-0-test||discontinued (EOL)||2012-12-11||2013-10-11||2015-03-04||2015-09-08|
|3.6 (details)||v3-6-test||discontinued (EOL)||2011-08-09||2012-12-11||2013-11-29||2015-03-04|
|3.5 (details)||v3-5-test||discontinued (EOL)||2010-03-01||2011-08-09||~2012-12-17||2013-10-11|
|3.4 (details)||v3-4-test||discontinued (EOL)||2009-07-03||2010-03-01||~2011-08-23||2012-12-11|
|3.3 (details)||v3-3-test||discontinued (EOL)||2009-01-27||2009-07-03||2010-03-01||2011-08-09|
|3.2 (details)||v3-2-test||discontinued (EOL)||2008-07-02||2009-01-27||2009-08-11||2010-03-01|
|3.0 (details)||v3-0-test||discontinued (EOL)||2003-09-24||2008-07-02||2009-01-27||2009-08-05|
The mode describes the status of the release series. The following modes exist:
- Upcoming Release
- Current Stable Release
- Maintenance Mode
- Security Fixes Only Mode
This is the new upcoming release branch. It's not ready for production. The branch is created when the first Release candidate becomes available for testing, otherwise development happens in our master GIT branch.
Current Stable Release
This is the current release branch. Available bug fixes will be included in the regular bug fix releases. Bug fix releases will be shipped every six weeks usually (and on a as needed basis). New features or parameters will be added to major releases only and not within a release cycle (there might be rare exceptions).
Maintenance mode means that there are regular bug fix releases to address major issues and security issues. Less patches are backported to this branch than to the current release series.
Security Fixes Only Mode
Only security issues will be addressed in this release series.
Discontinued (End of Life)
There won't be any other versions of this release series.
Release Branch Checkin Procedure
The release branch is created at the time of the first release candidate.
The release branches are closed to direct checkin as soon as they are created, so for all branches, only bug fixes are allowed into the branch, according to the following procedure:
- Every bug that is to be patched in a closed branch needs to be associated with a bug report in the Samba Bugzilla.
- The patch for the bug should already be in master, if possible.
- Open the bug before making the commit into master, if it is expected that this patch will need to be backported.
- Add the following tag to each patch to be backported
- Once past autobuild and in master on git.samba.org, it should be cherry-picked from master to the branch using git cherry-pick -x and git format-patch -1.
- The cherry-pick -x adds the (cherry-picked from XXXXX) marker, which allows tracing of patch history though the different branches
- Add BUG tags to patches that do not already have them
- The bug should be ASSIGNED, reopen it if the bug is already closed.
- It is acceptable to file a bug at this stage if one does not already exist.
- The developer of the patch needs to convince two team members that the bug is critical enough to be included in a closed branch.
- This is done by setting the review? flag on the uploaded patch.
- If you are a team member uploading the patch, one other team member needs to review the patch
- If you are not a team member, just ask two team members to review.
- Once reviewed, the reviewer should assign the patch to Karolin Seeger, our Release Manager.
- The Release Manager then applies the patch from bugzilla only if the patch has been signed off by two members of the Samba Team.
- The Release Manager then closes the bug when the patches have landed in all appropriate branches.