Permalink
Browse files

Merge branch 'release/1.3000_01' into devel

  • Loading branch information...
Alexis Sukrieh
Alexis Sukrieh committed Dec 22, 2010
2 parents 7c85248 + 2da36ea commit e4d422867e488e9273bd4640953390a79310a5c4
Showing with 69 additions and 1 deletion.
  1. +9 −0 MANIFEST
  2. +1 −1 lib/Dancer.pm
  3. +59 −0 lib/Dancer/Development/Integration.pod
View
@@ -18,6 +18,7 @@ lib/Dancer/Cookie.pm
lib/Dancer/Cookies.pm
lib/Dancer/Deployment.pod
lib/Dancer/Development.pod
+lib/Dancer/Development/Integration.pod
lib/Dancer/Engine.pm
lib/Dancer/Error.pm
lib/Dancer/FileUtils.pm
@@ -35,6 +36,7 @@ lib/Dancer/Logger/Console.pm
lib/Dancer/Logger/File.pm
lib/Dancer/ModuleLoader.pm
lib/Dancer/Object.pm
+lib/Dancer/Object/Singleton.pm
lib/Dancer/Plugin.pm
lib/Dancer/Plugin/Ajax.pm
lib/Dancer/Plugins.pod
@@ -64,12 +66,14 @@ lib/Dancer/Template/TemplateToolkit.pm
lib/Dancer/Test.pm
lib/Dancer/Timer.pm
lib/Dancer/Tutorial.pod
+lib/Dancer/Tutorial/WebSockets.pod
LICENSE
Makefile.PL
MANIFEST This list of files
MANIFEST.SKIP
README
script/dancer
+script/wallflower
t/00_base/000_create_fake_env.t
t/00_base/001_load.t
t/00_base/002_strict_and_warnings.t
@@ -82,6 +86,7 @@ t/00_base/08_pod_coverage_dancer.t
t/00_base/09_load_app.t
t/00_base/11_file_utils.t
t/00_base/12_utf8_charset.t
+t/00_base/13_dancer_singleton.t
t/00_base/config.t
t/00_base/dancer_test.t
t/00_base/lib/AppWithError.pm
@@ -208,11 +213,13 @@ t/11_logger/01_abstract.t
t/11_logger/02_factory.t
t/11_logger/03_file.t
t/11_logger/04_console.t
+t/11_logger/05_format.t
t/12_response/000_create_fake_env.t
t/12_response/01_CRLF_injection.t
t/12_response/02_headers.t
t/12_response/03_charset.t
t/12_response/04_charset_server.t
+t/12_response/05_api.t
t/13_engines/00_load.t
t/13_engines/02_template_init.t
t/14_serializer/000_create_fake_env.t
@@ -248,9 +255,11 @@ t/17_apps/01_settings.t
t/17_apps/02_load_app.t
t/17_apps/03_prefix.t
t/17_apps/04_issue_91.t
+t/17_apps/05_api.t
t/18_main_dsl/000_create_fake_env.t
t/18_main_dsl/01_config.t
t/18_main_dsl/uri_for.t
+t/19_dancer/01_script.t
t/lib/EasyMocker.pm
t/lib/Forum.pm
t/lib/LinkBlocker.pm
View
@@ -31,7 +31,7 @@ use File::Basename 'basename';
use base 'Exporter';
$AUTHORITY = 'SUKRIA';
-$VERSION = '1.2003';
+$VERSION = '1.3000_01';
@EXPORT = qw(
after
any
@@ -123,6 +123,65 @@ remote.
$ git push origin devel
+=head1 RELEASE CYCLES
+
+We have one main release cycle. This is the release cycle based on the I<devel>
+branch. We use this branch to build new releases, with new stuff all the new
+shiny commits we want.
+
+Those release are built with git-flow (with C<git-flow release>) and are then
+uploaded to CPAN.
+
+Since Dancer 1.2, we also have another parallell release cycle which is what we
+call the I<frozen> branch. It's a maintenance-only release cycle. That branch is
+created from the tag of the first release of a I<stable> version (namely a
+release series with an even minor number).
+
+This branch must be used only for bug-fixing the stable releases. Nothing new
+should occur in that branch.
+
+Let's take an example with Dancer 1.2003 and Dancer 1.3002.
+
+=over 4
+
+=item *
+
+Dancer 1.2003 is the last stable release of Dancer. Its codebase is handled in
+the I<frozen> branch, that has been created from the tag C<1.2000>.
+
+=item *
+
+Dancer 1.3002 is the last release of Dancer. As it belongs to a development
+series, it can provide new features, code refactoring and deprecations. Its
+codebase is handled by the integration branch, C<devel>.
+
+=item *
+
+When a bug is found in 1.2xxx, it's fixed in the C<frozen> branch, and a new
+release is built from here and then uploaded to CPAN.
+
+=item *
+
+Whenever the team wants to, they can release new versions of 1.3xxx from the
+devel branch, using C<git-flow release start>.
+
+=item *
+
+When the team finds that the current state of devel (namely, the last version of
+1.3xxx) is stable and mature enough. They can decide it will be the new stable
+version.
+
+Then, a release 1.4000_01 is built from devel, an upload is done to CPAN, and
+when ready, the 1.40001 can be uploaded the same way.
+
+From that moment, the master branch is merged into frozen in order to be able to
+hotfix the frozen branch in the future.
+
+It's now possible for the team to continue working on new stuff in devel,
+bumping the version number to 1.5000_01
+
+=back
+
=head1 AUTHOR
This documentation has been written by Alexis Sukrieh C<< <sukria@sukria.net> >>.

0 comments on commit e4d4228

Please sign in to comment.