tree c39acf819fb8afdc6827e682bb45a00116779910
parent babb60d2a40b677d4eb77c553dd1c918a6ef7d9b
parent 56b6749d10db7285dda22f182fbda3bd27fb694a
author OpenStack Proposal Bot <openstack-infra@lists.openstack.org> 1460014588 +0000
committer OpenStack Proposal Bot <openstack-infra@lists.openstack.org> 1460014589 +0000

Merge tag '6.0.0'

This is a null-merge of the 6.0.0 release tag back into the master
branch so that the 6.0.0 tag will appear in the git commit history of
the master branch. It contains no actual changes to the master branch,
regardless of how our code review system's UI represents it. Please
ask in #openstack-infra if you have any questions, and otherwise try
to merge this as quickly as possible to avoid later conflicts on the
master branch.

Change-Id: Id8bbf0421c4d74d92df22cf485b4c29bb05d685d