[Piuparts-commits] [piuparts] 01/01: Merge branch 'master' (release 0.62) into develop

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 903df38f653b47f62fc9979813885a949200d4b2
Merge: ea4be0e e3f7ad9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jan 6 10:48:18 2015 +0100

    Merge branch 'master' (release 0.62) into develop

 README_server.txt         | 2 +-
 conf/piuparts.conf.sample | 2 +-
 debian/changelog          | 7 +++++++
 piuparts.1.txt            | 2 +-
 piuparts.py               | 2 +-
 piupartslib/conf.py       | 2 +-
 tests/test_piuparts.py    | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index e2b6430,45e9372..7b8008c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,10 +1,36 @@@
 +piuparts (0.63) UNRELEASED; urgency=medium
 +
 +  [ Andreas Beckmann ]
 +  * piuparts.py:
 +    - Increase verbosity when reporting things installed over directory
 +      symlinks: report all symlinks and their targets.
 +    - Reinstall base system packages missing upon removal with
 +      --no-install-recommends.
 +  * piuparts.conf:
 +    - Enable --warn-on-debsums-errors for all jessie tests.
 +    - Add new suite: jessie-pu (test only packages in jessie-proposed-updates).
 +    - Add new suite: wheezy2jessie-rcmd (test with --install-recommends).
 +  * distros.conf: Reactivate 'testing' and 'stable' aliases, switch them back
 +    to 'jessie' and 'wheezy' for ongoing development.
 +  * piuparts-slave.py:
 +    - Handle Ctrl-C while downloading Packages files and flush/unreserve, too.
 +    - Catch another exception that may happen while talking to the master.
 +
 +  [ Holger Levsen ]
 +  * piuparts.conf.pejacevic: add new suite: jessie2proposed.
 +  * piuparts.conf.piu-slave-1und1-01: merge changes from pejacevic config but
 +    replace amd64 with i386. 
 +  * crontab-master.in: update webpages every six hours. 
 +
 + -- Andreas Beckmann <anbe at debian.org>  Wed, 03 Dec 2014 20:36:30 +0100
 +
+ piuparts (0.62) unstable; urgency=medium
+ 
+   * Default to http://http.debian.net/debian instead of the deprecated
+     http://cdn.debian.net service as default mirror. (Closes: #774471)
+ 
+  -- Holger Levsen <holger at debian.org>  Tue, 06 Jan 2015 10:36:39 +0100
+ 
  piuparts (0.61) unstable; urgency=medium
  
    [ Michael Prokop ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git