diff options
| author | Johannes Schlüter <johannes@php.net> | 2014-08-14 17:13:44 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2014-08-14 17:13:44 +0200 |
| commit | aeb633543bbd571d7fb440d54ae3b0f1a4dfece7 (patch) | |
| tree | 9f175ac2a7f0eef69f51c15449ccedf1c8c513c7 /README.GIT-RULES | |
| parent | f6896e4395e89ceeacd8f8a940cbafeeee3ac4a3 (diff) | |
| parent | 7311087cf06bf9f3d6b5863d9b54272f3d163ba9 (diff) | |
| download | php-git-aeb633543bbd571d7fb440d54ae3b0f1a4dfece7.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'README.GIT-RULES')
| -rw-r--r-- | README.GIT-RULES | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index 3df9d17bcd..d966093f25 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -51,9 +51,7 @@ Currently we have the following branches in use:: PHP-5.4 Is used to release the PHP 5.4.x series. This is a current stable version and is open for bugfixes only. - PHP-5.3 Is used to release the PHP 5.3.x series. This is currently - in extended support and open forsecurity fixes only. Triaged - via security@php.net + PHP-5.3 This branch is closed. PHP-5.2 This branch is closed. @@ -63,7 +61,7 @@ Currently we have the following branches in use:: The next few rules are more of a technical nature:: - 1. All changes should first go to the lowest branch (i.e. 5.3) and then + 1. All changes should first go to the lowest branch (i.e. 5.4) and then get merged up to all other branches. If a change is not needed for later branches (i.e. fixes for features which where dropped from later branches) an empty merge should be done. |