From 6b9debaa2476a393d90dae1c33111d4c29d37464 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Wed, 18 Feb 2015 11:24:31 -0800 Subject: [PATCH] Stop referring to grizzly I am pretty sure that won't even work. Also fix tiny typo in the faq Change-Id: Ie2e5640b8d4214a271d5af3b652b1a18db010b61 --- README.md | 4 ++-- doc/source/faq.rst | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 40060a7cf5..206ffe098b 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,9 @@ in a clean and disposable vm when you are first getting started. The DevStack master branch generally points to trunk versions of OpenStack components. For older, stable versions, look for branches named stable/[release] in the DevStack repo. For example, you can do the -following to create a grizzly OpenStack cloud: +following to create a juno OpenStack cloud: - git checkout stable/grizzly + git checkout stable/juno ./stack.sh You can also pick specific OpenStack project releases by setting the appropriate diff --git a/doc/source/faq.rst b/doc/source/faq.rst index a449f496ee..d3b491fdac 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -80,7 +80,7 @@ Q: Why can't I use another shell? Q: But, but, can't I test on OS/X? A: Yes, even you, core developer who complained about this, needs to install bash 4 via homebrew to keep running tests on OS/X. Get a Real - Operating System. (For most of you who don't know, I am refering to + Operating System. (For most of you who don't know, I am referring to myself.) Operation and Configuration @@ -118,13 +118,13 @@ Q: How do I run a specific OpenStack milestone? :: [[local|localrc]] - GLANCE_BRANCH=stable/grizzly - HORIZON_BRANCH=stable/grizzly - KEYSTONE_BRANCH=stable/grizzly - NOVA_BRANCH=stable/grizzly - GLANCE_BRANCH=stable/grizzly - NEUTRON_BRANCH=stable/grizzly - SWIFT_BRANCH=1.10.0 + GLANCE_BRANCH=stable/juno + HORIZON_BRANCH=stable/juno + KEYSTONE_BRANCH=stable/juno + NOVA_BRANCH=stable/juno + GLANCE_BRANCH=stable/juno + NEUTRON_BRANCH=stable/juno + SWIFT_BRANCH=2.2.1 Q: Why not use [STRIKEOUT:``tools/pip-requires``]\ ``requirements.txt`` to grab project dependencies? [STRIKEOUT:The majority of deployments will use packages to install