summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-11 12:59:07 -0500
committerGitHub <noreply@github.com>2017-01-11 12:59:07 -0500
commitee3338b15dbe73a4150b36931116cea27ee188f1 (patch)
tree74dccd1db7c6a7d1803c98ceef4d514f1363073c
parentc9919242e76c03ea25993d8ee14c2ac64014077c (diff)
parent444299d3168534b8820a392410c46900ead3f0be (diff)
downloadopenshift-ee3338b15dbe73a4150b36931116cea27ee188f1.tar.gz
openshift-ee3338b15dbe73a4150b36931116cea27ee188f1.tar.bz2
openshift-ee3338b15dbe73a4150b36931116cea27ee188f1.tar.xz
openshift-ee3338b15dbe73a4150b36931116cea27ee188f1.zip
Merge pull request #3073 from sdodson/branches
Update branch status
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 635981b45..7a286d3b7 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ The [master branch](https://github.com/openshift/openshift-ansible/tree/master)
tracks our current work and should be compatible with both [Origin master
branch](https://github.com/openshift/origin/tree/master) and the [most recent
Origin stable release](https://github.com/openshift/origin/releases). Currently
-that's v1.4 and v1.3.x. In addition to the master branch, we maintain stable
+that's v1.5 and v1.4. In addition to the master branch, we maintain stable
branches corresponding to upstream Origin releases, e.g.:
[release-1.2](https://github.com/openshift/openshift-ansible/tree/release-1.2).
The most recent branch will often receive minor feature backports and fixes.