tree 7107a57ec86ae5aa6a8096e69bf34336004b4a83
parent e28e8266d4832931e07cdcf10a6040db47801be2
parent 246a1db14e159bfaa6e83b3ea3158e053d5e313e
author OpenStack Proposal Bot <openstack-infra@lists.openstack.org> 1466533413 +0000
committer OpenStack Proposal Bot <openstack-infra@lists.openstack.org> 1466533413 +0000

Merge tag '6.1.0'

This is a null-merge of the 6.1.0 release tag back into the master
branch so that the 6.1.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: I94019769a3ebcaba66e8bc1544a3563f325c1735