[Piuparts-commits] [piuparts] 01/02: Merge branch 'develop'

[Holger Levsen]

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

holger pushed a commit to branch master
in repository piuparts.

commit 31f56fbd9461936ccd0df0fa25ea594a33cbb83a
Merge: dbaafeb a4b2610
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Aug 25 10:23:24 2015 +0200

    Merge branch 'develop'
    
    Fixed conflicts:
    	debian/changelog

 .../copyright_file_missing_after_upgrade.mail      |  2 +-
 .../unhandled_symlink_to_directory_conversion.mail |  2 +-
 custom-scripts/scripts/post_remove_exceptions      | 12 +++
 custom-scripts/scripts/pre_install_exceptions      | 22 +++---
 .../scripts/pre_remove_40_find_missing_md5sums     |  3 +
 .../scripts/pre_remove_40_find_obsolete_conffiles  |  2 +-
 .../scripts/pre_remove_40_find_unowned_lib_links   | 20 ++++-
 debian/changelog                                   | 30 +++++++-
 debian/control                                     |  5 +-
 instances/piuparts.conf.anbe                       | 87 +++++++++++++++++++++-
 known_problems/conffile_prompt_error.conf          |  2 +-
 master-bin/reschedule_oldest_logs.in               |  5 +-
 piuparts-master-backend.py                         | 10 ++-
 piuparts-report.py                                 |  1 +
 piuparts-slave.py                                  |  2 +-
 piuparts.1.txt                                     | 18 ++++-
 piuparts.py                                        | 53 +++++++++----
 piupartslib/__init__.py                            | 10 ++-
 piupartslib/packagesdb.py                          | 49 +++++++++---
 19 files changed, 279 insertions(+), 56 deletions(-)


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