diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2016-11-21 17:36:44 +1100 |
|---|---|---|
| committer | Joshua Hesketh <josh@nitrotech.org> | 2016-11-22 11:15:24 +1100 |
| commit | 3f7def34240777e93654fa686e58deb0ddd6239b (patch) | |
| tree | 70cafe88d869909d65c9a120d976840495ae0a8c /README.rst | |
| parent | 8b2bc0cfe734d143eb369d2d21e086e0057685ae (diff) | |
| parent | 63a595bae3f3db85582ddba2d51ad4124877034f (diff) | |
| download | zuul-3f7def34240777e93654fa686e58deb0ddd6239b.tar.gz | |
Merge branch 'master' into workingv3
This includes forward-porting changes to launcher/server.py with the
exception of the pre/post playbooks changes which will be done in a
follow up commit as they have deviated.
Change-Id: I13aa229c1460b748745babe178c0a745e52f841c
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/README.rst b/README.rst index f1ff497aa..4a3376eea 100644 --- a/README.rst +++ b/README.rst @@ -10,6 +10,11 @@ preparation for the third major version of Zuul. We call this effort Contributing ------------ +We are currently engaged in a significant development effort in +preparation for the third major version of Zuul. We call this effort +`Zuul v3`_ and it is described in this file in the `feature/zuulv3` +branch of this repo. + To browse the latest code, see: https://git.openstack.org/cgit/openstack-infra/zuul/tree/ To clone the latest code, use `git clone git://git.openstack.org/openstack-infra/zuul` |