Skip to content

Commit

Permalink
Updating release branch information
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasjacobsen committed Nov 15, 2013
1 parent 334467f commit 857402c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
Binary file modified developers_guide/MPAS-DevelopersGuide.pdf
Binary file not shown.
10 changes: 8 additions & 2 deletions developers_guide/MPAS-DevelopersGuide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ \section{Branch Strategy}

\section{Release Branches}
\label{sec:release-branches}
One of the variable branch types that developers will see in the shared
One of the various branch types that developers will see in the shared
repository is a release branch. This release branch is used to prepare the code
for a new release, and comes with some guidelines of use.

Expand All @@ -317,7 +317,7 @@ \section{Release Branches}
tagged with a new version number, and then pushed into the MPAS-Release
repository for a public release.

A feature branch can be thought of as a feature freeze. Once the release branch
A release branch can be thought of as a feature freeze. Once the release branch
is created, no new features can make it into the next release. The only commits
that can be appended to a release branch are clean up and bug fix commits.

Expand All @@ -342,6 +342,12 @@ \section{Release Branches}
consume. However, the core group that intends to release should announce the
targeted date of release as soon as they have one selected.

The creation of a release branch can be delayed. A request for the delay of
creation should be made through the mpas-developers mailing list. Any other
core is allowed to deny the request for any reason. It should also be
understood that delaying the creation of the release branch does not delay the
actual release itself.

\section{Version Numbers}
\label{sec:version-numbers}
MPAS will have a two number versioning system. For example, 0.0 or 1.5. In this
Expand Down

0 comments on commit 857402c

Please sign in to comment.