summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-08 15:38:52 -0400
committerGitHub <noreply@github.com>2016-09-08 15:38:52 -0400
commiteaf2932db8d86bf47cf54a5da4315c464b1c7abe (patch)
tree0d51424a9efec70a14139bfd704dd9e6339da1d7 /README.md
parent5637ec58fd31a019f2d7e5a0b6760fb21f273881 (diff)
parentd84788c51034fb73e4826393a59eecf90addeb3f (diff)
downloadopenshift-eaf2932db8d86bf47cf54a5da4315c464b1c7abe.tar.gz
openshift-eaf2932db8d86bf47cf54a5da4315c464b1c7abe.tar.bz2
openshift-eaf2932db8d86bf47cf54a5da4315c464b1c7abe.tar.xz
openshift-eaf2932db8d86bf47cf54a5da4315c464b1c7abe.zip
Merge pull request #2418 from sdodson/branches
Explain our branching strategy
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/README.md b/README.md
index 4fa0286a8..527a4858a 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,15 @@ 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
+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.
+
##Setup
- Install base dependencies:
- Fedora: