diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-16 13:14:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-16 13:14:05 -0400 |
| commit | bf7f84ae7ce60c9af36a810df22aa442e1484d5f (patch) | |
| tree | b5d8b2a1cb94d9a74db70d9ab7c9616acf98a974 /README.md | |
| parent | bfff69658d6c53efc31994a209d5ae4c3fdc88d5 (diff) | |
| parent | 69bd67eaf6cf2e63651a32d7b799312f851a661b (diff) | |
| download | openshift-bf7f84ae7ce60c9af36a810df22aa442e1484d5f.tar.gz openshift-bf7f84ae7ce60c9af36a810df22aa442e1484d5f.tar.bz2 openshift-bf7f84ae7ce60c9af36a810df22aa442e1484d5f.tar.xz openshift-bf7f84ae7ce60c9af36a810df22aa442e1484d5f.zip | |
Merge pull request #2447 from sdodson/branches
Switch to origin-1.x branch names
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -7,14 +7,18 @@ that it installs currently require a package that provides `docker`. Currently the RPMs provided from dockerproject.org do not provide this requirement, though they may in the future. -##Branches +##Branches and tags + The master branch tracks our current work and should be compatible with both -Origin master branch and the current Origin stable release, currently that's -v1.3 and v1.2. Enterprise branches exist where we coordinate with internal Red -Hat Quality Assurance teams. Fixes and backwards compatible feature improvements -are often backported to the more current enterprise branches. The enterprise -branches should also be compatible with the corresponding Origin release for -users who are looking for more conservative rate of change. +Origin master branch and the most recent Origin stable release. Currently that's +v1.3 and v1.2.x. In addition to the master branch we maintain stable branches +corresponding to upstream Origin releases, ie: release-1.2. The most recent of +branch will often receive minor feature backports and fixes. Older branches will +receive only critical fixes. + +Releases are tagged periodically from active branches and are versioned 3.x +corresponding to Origin releases 1.x. We unfortunately started with 3.0 and it's +not practical to start over at 1.0. ##Setup - Install base dependencies: |