summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-27 08:23:38 -0400
committerGitHub <noreply@github.com>2017-07-27 08:23:38 -0400
commit6a9fd57be17d03818eb1f72cc9d62505690eec14 (patch)
tree12873a1c5d77ce1bfe369cfd04de6fb2f10dd7df /README.md
parente03ab3aa77816edf09fcd5b1b9642b1a22304e5b (diff)
parent5b0dd51e5b695e28a7d26de9c99029a080c11e64 (diff)
downloadopenshift-6a9fd57be17d03818eb1f72cc9d62505690eec14.tar.gz
openshift-6a9fd57be17d03818eb1f72cc9d62505690eec14.tar.bz2
openshift-6a9fd57be17d03818eb1f72cc9d62505690eec14.tar.xz
openshift-6a9fd57be17d03818eb1f72cc9d62505690eec14.zip
Merge pull request #4884 from warmchang/version-3.6
Follow the new naming conventions.
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index 1cf8d1156..71912fb98 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,8 @@ Follow this release pattern and you can't go wrong:
| ------------- | ----------------- |
| 1.3 | 3.3 |
| 1.4 | 3.4 |
-| 1.*X* | 3.*X* |
+| 1.5 | 3.5 |
+| 3.*X* | 3.*X* |
If you're running from the openshift-ansible **master branch** we can
only guarantee compatibility with the newest origin releases **in