[ol7_optional_archive] yum-plugin-merge-conf-1.1.31-25.0.1.el7_0.noarch

This yum plugin adds the "--merge-conf" command line option. With this option,
Yum will ask you what to do with config files which have changed on updating a
package.

Changelog (Show File list) (Show related packages)

• Tue Aug 12 2014 Andrey Yutman <andrey.yutman@oracle.com> - 1.1.31-25.0.1

  - add dependency btrfs-progs for yum-plugin-fs-snapshot [bug 16285176]
  - use unified btrfs binary instead of btrfsctl [bug 16285176]

• Tue Aug 05 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 1.1.31-25

  - yumdownloader, yum-builddep: do not ignore source repos.
  - Resolves: bug#1082050

• Fri Feb 14 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 1.1.31-24

  - reposync: fix 'reposync -r nosuchrepo' behaviour.
  - Resolves: bug#1060702

• Mon Jan 20 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 1.1.31-23

  - yum-builddep: Use srpms in already enabled repos.
  - Resolves: bug1024070

• Wed Jan 15 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 1.1.31-22

  - Fix repo suffix to '-debug-rpms' in debuginfo-install.
  - Resolves: bug#1052871

• Fri Jan 10 2014 Valentina Mukhamedzhanova <vmukhame@redhat.com> - 1.1.31-21

  - Fix YumBaseError name error in repoquery
  - Resolves: bug#1050218

• Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.1.31-20

  - Mass rebuild 2013-12-27

• Fri Nov 01 2013 James Antill <james.antill@redhat.com> - 1.1.31-19

  - Remove security plugin.
  - Resolves: rhbz#1002491

• Mon Sep 09 2013 James Antill <james.antill@redhat.com> - 1.1.31-18

  - Disable puppetverify plugin for el7. BZ 1002876.
  - reposync: fix a copy-paste error. BZ 994514
  - repo-rss: non-ASCII fix, sorting.
  - Add --nogroups and --noplugins options to verifytree.

• Wed Jul 31 2013 Zdenek Pavlas <zpavlas@redhat.com> - 1.1.31-17

  - Use new findRepos() API for yum-config-manager. BZ 971599