Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

The first release of a major version is a feature release, and contains all the new features developed for that new version of Asterisk. Each major version typically only has a single feature release (see New Feature policy below).

Section

Point Releases

New versions of Asterisk are released on a periodic basis from all currently supported major version branches, typically every 4 to 6 weeks. These Asterisk releases are point releases, and primarily contain bug fixes for reported issues against those branches. Sometimes, these releases will also include improvements and new features. For more information about what is contained in a release, see that release's Change Log.

Sometimes, a sufficiently critical regression will be detected that will warrant an immediate regression release. These releases are made from the previous release's tag, as opposed to the major version branch.

...

Bug fixes are merged into all supported release branches that contain that particular bug. Cherry-picks may occur in any direction; however, all branches with the bug should receive said fix.Note  When dealing with multiple branches, it's hard to keep track of where comments are made so comments will always be made in the gerrit review for the lowest branch. The patch should therefore be submitted to gerrit against the lowest applicable branch, and cherry-picked to the other branches, including master. With controversial or large patches, it's highly recommended to submit only against the lowest applicable branch and wait for feedback before cherry-picking. This will save you the time and aggravation of re-cherry-picking your review after every comment. An Asterisk team member will usually give you the "OK to cherry-pick" comment when it's safe for you to do so.  Note that in some very rare cases, a bug fix may be deemed too intrusive in a particular branch. Such cases are discussed when the patches are proposed.

...

titleExample: Bug Fix in 11

 

A bug is reported against Asterisk

11

13. The current supported branches are

Asterisk 11 and 13. The patch is first made against Asterisk 11, then cherry-picked to Asterisk 13. Finally, it is cherry-picked to Asterisk master.

Note that the author of the patch does not have to start in Asterisk 11. The patch could just as easily been written initially against Asterisk master. However, the patch must be applied to all supported branches to be included in Asterisk.

13, 16, 18 and 19. You should submit your patch to gerrit for the 13 branch. To avoid having to re-cherry-pick to the other branches, you stop there and wait for feedback. If you get negative feedback, you address it and re-submit the review. When an Asterisk team member sees that you have enough "+1" votes on your review, they'll add an "OK to cherry-pick to the other branches" comment which you can then do. Usually a "+2" to start the test and merge process will follow shortly.

 

Section
titleExample
Column
width25%
Column
width75%
Tip

See Git Usage and Gerrit Usage for more information on cherry-picking between Asterisk branches.

 

 

 

 

Anchor
newfeatures
newfeatures

...

  • Improve on existing functionality in Asterisk (better implementation, improved performance, etc.)
  • Add new functionality to Asterisk

New features must always be written against master first. A new feature may be proposed for an existing release branchshould follow the same procedure as bug fixes however they are, subject to the following conditions:

...