diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-10 16:51:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 16:51:01 -0400 |
| commit | 7c7b91c23cf78616df0d583a7c694b446ebef6af (patch) | |
| tree | 9da14a4669abeab7bd0dd513c49ce544e46c7e50 | |
| parent | 6528031d5ec24d62ffe28687bb134bc1237f0210 (diff) | |
| parent | 9070fe6023bd910ed629b5989704cf968a415ff3 (diff) | |
Merge pull request #5057 from openshift/sdodson-patch-1
Update README.md
| -rw-r--r-- | README.md | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -35,12 +35,12 @@ fixes. Older branches will receive only critical fixes. Follow this release pattern and you can't go wrong: -| Origin | OpenShift-Ansible | -| ------------- | ----------------- | -| 1.3 | 3.3 | -| 1.4 | 3.4 | -| 1.5 | 3.5 | -| 3.*X* | 3.*X* | +| Origin/OCP | OpenShift-Ansible version | openshift-ansible branch | +| ------------- | ----------------- |----------------------------------| +| 1.3 / 3.3 | 3.3 | release-1.3 | +| 1.4 / 3.4 | 3.4 | releaes-1.4 | +| 1.5 / 3.5 | 3.5 | release-1.5 | +| 3.*X* | 3.*X* | release-3.x | If you're running from the openshift-ansible **master branch** we can only guarantee compatibility with the newest origin releases **in |