From: Ximin Luo <infinity0@debian.org>
Date: Wed, 5 Apr 2017 14:48:53 +0000 (+0200)
Subject: Merge branch 'debian/sid' into debian/experimental
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eb81f7e1f368adcbfbcb27a3a860c0b2da95adde;p=rustc.git

Merge branch 'debian/sid' into debian/experimental
---

eb81f7e1f368adcbfbcb27a3a860c0b2da95adde
diff --cc debian/changelog
index 053115b4d6,805bf6fd36..08d63430a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
 +rustc (1.16.0+dfsg1-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * u-ignoretest-jemalloc.patch removed (applied upstream)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 17 Mar 2017 10:33:46 +0100
 +
+ rustc (1.15.1+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable so we have something to build 1.16 with.
+   * Try to fix ignoring atomic-lock-free tests on armhf.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 22 Mar 2017 00:13:27 +0100
+ 
  rustc (1.15.1+dfsg1-1~exp3) experimental; urgency=medium
  
    * Ignore atomic-lock-free tests on armhf.