You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2013/10/21 05:38:26 UTC

svn commit: r883521 - in /websites/production/camel/content: cache/main.pageCache merging-commits-from-trunk-to-fixes-branch.html

Author: buildbot
Date: Mon Oct 21 03:38:26 2013
New Revision: 883521

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/merging-commits-from-trunk-to-fixes-branch.html

Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/camel/content/merging-commits-from-trunk-to-fixes-branch.html
==============================================================================
--- websites/production/camel/content/merging-commits-from-trunk-to-fixes-branch.html (original)
+++ websites/production/camel/content/merging-commits-from-trunk-to-fixes-branch.html Mon Oct 21 03:38:26 2013
@@ -89,7 +89,7 @@
 
 
 <h2><a shape="rect" name="Mergingcommitsfromtrunktofixesbranch-Whatshouldbemerged"></a>What should be merged</h2>
-<p>The idea is to be able to apply bug fixes and backwards compatible improvements and new features to our Camel maintenance branches (for example 2.10.x and 2.9.x) while leaving <b>NONE</b> backwards compatible changes on the trunk. The idea is to give our users the best experience possible on any supported branch as long we have 100% backward compatibility on patch versions.</p>
+<p>The idea is to be able to apply bug fixes and backwards compatible improvements and new features to our Camel maintenance branches (for example 2.10.x and 2.9.x) while leaving <b>NON</b> backwards compatible changes on the trunk. The idea is to give our users the best experience possible on any supported branch as long we have 100% backward compatibility on patch versions.</p>
 
 <h3><a shape="rect" name="Mergingcommitsfromtrunktofixesbranch-WhatshouldbeconsideredasNOTbackwardscompatible"></a>What should be considered as NOT backwards compatible</h3>
 <ul class="alternate" type="square"><li>change in our public API</li><li>change in the behavior of a component</li><li>change in a default value of a component</li></ul>