summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-07 15:37:07 -0400
committerScott Dodson <sdodson@redhat.com>2016-09-07 15:38:30 -0400
commitd84788c51034fb73e4826393a59eecf90addeb3f (patch)
tree79966f1756c45c5050ab3ce519389adc0d13923e
parent5ca0a74fb271678708268c940fd52ccd15d207ca (diff)
downloadopenshift-d84788c51034fb73e4826393a59eecf90addeb3f.tar.gz
openshift-d84788c51034fb73e4826393a59eecf90addeb3f.tar.bz2
openshift-d84788c51034fb73e4826393a59eecf90addeb3f.tar.xz
openshift-d84788c51034fb73e4826393a59eecf90addeb3f.zip
Explain our branching strategy
-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: