From: Thomas Goirand <zigo@debian.org>
Date: Tue, 22 Mar 2016 10:39:08 +0000 (+0100)
Subject: Merge branch 'debian/mitaka' of git+ssh://git.debian.org/git/openstack/cinder into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3c1fa701889fe40770018da4b6f519abfb9d38b8;p=openstack-build%2Fcinder-build.git

Merge branch 'debian/mitaka' of git+ssh://git.debian.org/git/openstack/cinder into debian/mitaka

Conflicts:
	debian/changelog

Rewritten-From: ed7cdca76b67c41e8110d992edbee472d1a63bb6
---

3c1fa701889fe40770018da4b6f519abfb9d38b8
diff --cc trusty/debian/changelog
index 7b958fb73,5e257e35b..747e75840
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@@ -3,7 -3,7 +3,8 @@@ cinder (2:8.0.0~rc1-1) experimental; ur
    * New upstream release.
    * Disable non-deterministic failed tests:
      cinder.tests.unit.test_volume.VolumeTestCase.test_create_delete_volume
 +  * Fixed (build-)depends for this release.
+   * Removed install-missing-files.patch.
  
   -- Thomas Goirand <zigo@debian.org>  Mon, 14 Mar 2016 14:10:58 +0100