[Debian-astro-commits] [python-astropy] 01/01: Merge branch 'debian' into experimental

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository python-astropy.

commit 4e5a2e5676be7af0132bf00262641b98fcbaa7a0
Merge: 6ab468a 9f027eb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 27 11:36:40 2015 +0100

    Merge branch 'debian' into experimental

 debian/changelog     | 2 ++
 debian/tests/control | 1 +
 2 files changed, 3 insertions(+)

diff --cc debian/changelog
index 6f2af28,4b0d4f1..358305a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,7 +1,8 @@@
 -python-astropy (1.0.5-3) UNRELEASED; urgency=low
 +python-astropy (1.1~b1-1) experimental; urgency=low
  
 +  * New upstream beta version
+   * [Martin Pitt] Ignore stderr for python3 test to avoid failing on
+     the ResourceWarning stderr message. Closes: #803068
  
   -- Ole Streicher <olebole at debian.org>  Fri, 16 Oct 2015 08:58:30 +0200
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git