[ol6_latest_archive] yum-plugin-merge-conf-1.1.30-10.0.1.el6.noarch

Name:	yum-plugin-merge-conf
Version:	1.1.30
Release:	10.0.1.el6
Architecture:	noarch
Group:	System Environment/Base
Size:	29846
License:	GPLv2+
RPM:	yum-plugin-merge-conf-1.1.30-10.0.1.el6.noarch.rpm
Source RPM:	yum-utils-1.1.30-10.0.1.el6.src.rpm
Build Date:	Tue Dec 13 2011
Build Host:	ca-build44.us.oracle.com
Vendor:	Oracle America
URL:	http://yum.baseurl.org/download/yum-utils/
Summary:	Yum plugin to merge configuration changes when installing packages
Description:	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 Dec 13 2011 Keshav Sharma <keshav.sharma@oracle.com> - 1.1.30-10.0.1
```
- Workaround yum clean issue with ULN.
```

Wed Sep 21 2011 James Antill <james.antill@redhat.com> - 1.1.30-10

- Workaround update object post manual excludes, mostly.
- Resolves: rhbz#734428

Wed Sep 14 2011 Zdenek Pavlas <zpavlas@redhat.com> - 1.1.30-9

- Changed rhn_source_repos default to True.
- Related: rhbz#710469

Fri Sep 09 2011 Zdenek Pavlas <zpavlas@redhat.com> - 1.1.30-8

- Check doUtilBuildTransaction return value.
- Resolves: rhbz#709043
- Force ASCII apostrophes in man page examples.
- Resolves: rhbz#659740
- Updated previous patch, adding RHN source repos.
- Resolves: rhbz#732649
- Related: rhbz#710469

Wed Aug 10 2011 James Antill <james.antill@redhat.com> - 1.1.30-7

- Fix some yum-security man page typos.
- Resolves: rhbz#720967
- Fix for repo setup in reposync, mainly for RHN repos.
- Resolves: rhbz#713108
- Add RHN source repos. patterns to yumdownloader and yum-builddep.
- Resolves: rhbz#710469
- Make yumdownloader exit with a failure when it fails to download.
- Resolves: rhbz#699470
- Fix yum-groups-manager to accept non-default config. files.
- Resolves: rhbz#694188

Tue Mar 22 2011 James Antill <james.antill@redhat.com> - 1.1.30-6

- Fix yum-config-manager repo file saving error when in repo id is $basearch
- Resolves: rhbz#679098

Tue Mar 15 2011 James Antill <james.antill@redhat.com> - 1.1.30-5
```
- Fix typo in the FS snapshot patch.
- Resolves: rhbz#669178
```

Wed Mar 02 2011 James Antill <james.antill@redhat.com> - 1.1.30-4

- Fix typo in the FS snapshot patch.
- Resolves: rhbz#669178
- yumdownloader man page do not mention --archlist option
- Resolves: rhbz#616408
- Resolves: rhbz#659497

Tue Feb 08 2011 James Antill <james.antill@redhat.com> - 1.1.30-3

- Make FS snapshot fail, if the lvm snapshot fails.
- Resolves: rhbz#659497
- Resolves: rhbz#669178

Fri Feb 04 2011 James Antill <james.antill@redhat.com> - 1.1.30-2

- Fix aliases rebase to upstream 1.1.30.
- Resolves: rhbz#659497
- Resolves: rhzb#674584

Thu Jan 13 2011 James Antill <james.antill@redhat.com> - 1.1.30-1

- Rebase to upstream 1.1.30 for bugfixes and new features.
- Resolves: rhbz#659497
- Some of the changes included in the above are:
- yum-plugin-verify reports small changes in mtime
- Resolves: rhbz#604529
- yumdownloader man page do not mention --archlist option
- Resolves: rhbz#616408
- deprecation warning messages in repomanage
- Resolves: rhbz#620652
- tsflags plugin is using deprecated function setConfigOption
- Resolves: rhbz#627533
- yum-debug-dump saves the output to a wrong file
- Resolves: rhbz#641837
- Update the "security" plugin for the new updateinfo data
- Resolves: rhbz#662790

Wed Jul 14 2010 James Antill <james.antill@redhat.com> - 1.1.26-11

- Fix minor return code bugs in updateonboot initscript.
- Resolves: rhbz#536770

Wed Jun 09 2010 James Antill <james.antill@redhat.com> - 1.1.26-10

- Don't traceback when repomanage is given a bad path.
- Resolves: rhbz#587288

Wed May 26 2010 James Antill <james.antill@redhat.com> - 1.1.26-9
```
- Add yum-config-manager
- Resolves: rhbz#536911
```

Thu May 20 2010 James Antill <james.antill@redhat.com> - 1.1.26-8

- Fix versionlock with follow_obsoletes=true
- Resolves: rhbz#592206
- Fix repodiff
- Resolves: rhbz#592943

Sat Apr 17 2010 James Antill <james.antill@redhat.com> - 1.1.26-7

- Get lots of fixes from latest HEAD. Also:
- --alldeps default in repoquery.
- repoquery will now do a full provides version check.
- Add repoclosure --group.
- Big repodiff speedup.
- Resolves: rhbz#576705

Wed Feb 10 2010 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.26
```
Fri Jan 29 2010 James Antill<james.antill@redhat.com> - 1.1.24-4
```
- Remove refresh-updatesd
- Resolves: rhbz#543948
```

Wed Jan 27 2010 Tim Lauridsen <timlau@fedoraproject.org>

- mark as 1.1.25
- add touch /etc/yum.repos.d/_local.repo to install section
- this need for for the ghost in files section of yum-plugin-local

Fri Jan 08 2010 James Antill<james.antill@redhat.com> - 1.1.24-3

- Get the latest yum-utils from git. Lots of fixes. Incl.
- Resolves: rhbz#523574

Mon Nov 30 2009 Dennis Gregorovic <dgregor@redhat.com> - 1.1.24-2.1
```
- Rebuilt for RHEL 6
```

Sun Nov 08 2009 Tim Lauridsen <timlau@fedoraproject.org>

- remove basearchonly since all versions of yum for quite some time obsolete it
- truncate changelog to last 2 years

Sat Nov 07 2009 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.24
```
Wed Nov 04 2009 Seth Vidal <skvidal at fedoraproject.org>
```
- add needs-restarting
```

Mon Oct 12 2009 Seth Vidal <skvidal at fedoraproject.org>

- add python compileall to all plugins so we get .pyc/.pyo files in them
- fixes https://bugzilla.redhat.com/show_bug.cgi?id=493174

Wed Sep 02 2009 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.23
```
Tue May 19 2009 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.22
```
Mon May 18 2009 Seth Vidal <skvidal at fedoraproject.org>
```
- add show-leaves plugin from Ville Skyttä
```
Wed Mar 25 2009 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.21
```

Mon Mar 02 2009 Tim Lauridsen <timlau@fedoraproject.org>

- set yum require to 3.2.21 (the 3.2.21 in rawhide is patched to yum head, so it matches the need yum 3.2.22 code)
- Added versioned Provides: yum-<pluginname> to make rpm/yum happy.
- yum-updateonboot is not renamed and dont need Obsoletes/Conflicts/Provides

Sun Mar 01 2009 Tim Lauridsen <timlau@fedoraproject.org>

- mark as 1.1.20
- rename plugins from yum-name to yum-plugin-name

Wed Feb 25 2009 Tim Lauridsen <timlau@fedoraproject.org>

- Remove yum-kernel-module & yum-fedorakmod plugins (no obsoleting yet)
- Remove yum-skip-broken plugin leftovers

Tue Feb 03 2009 James Antill <james@fedoraproject.org>
```
- add auto-update-debuginfo plugin
```
Wed Dec 17 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.19
```

Wed Dec 10 2008 Seth Vidal <skvidal at fedoraproject.org>

- add find-repos-of-install from James' stash of misc stuff

Wed Oct 29 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.18
```
Mon Oct 27 2008 Seth Vidal <skvidal at fedoraproject.org>
```
- add rpm-warm-cache plugin
```
Fri Sep 19 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- removed skip-broken plugin
```
Wed Sep 17 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.17
```
Mon Sep 08 2008 Seth Vidal <skvidal at fedoraproject.org>
```
- add yum-remove-with-leaves plugin
```
Wed Aug 27 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.16
```
Wed Aug 20 2008 James Antill <james@fedoraproject.org>
```
- add yum-groups-manager
```
Thu Aug 07 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.15
```
Wed May 21 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- add verifytree
```

Wed May 21 2008 Tim Lauridsen <timlau@fedoraproject.org>

Make yum-fastestmirror %files handle the fastestmirror-asyncore.py file

Wed May 21 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.14
```
Thu Apr 10 2008 James Antill <james@fedoraproject.org>
```
- Add keys plugin
```
Mon Mar 31 2008 James Antill <james@fedoraproject.org>
```
- Add yum-aliases man page
```
Fri Mar 21 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.13
```
Fri Mar 21 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.12
```

Tue Mar 18 2008 Shawn Starr <shawn.starr@rogers.com>

- Add yum-utils.1 manual page
- Rename yum-complete-transaction manual page to 8
- Move yum-complete-transaction to /usr/sbin

Sat Mar 01 2008 James Antill <james@fedoraproject.org>
```
- Add verify plugin
```
Wed Feb 20 2008 James Antill <james@fedoraproject.org>
```
- Add empty versionlock file
```
Fri Feb 01 2008 James Antill <james@fedoraproject.org>
```
- Add filter-data plugin
```
Wed Jan 30 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.11
```
Sun Jan 13 2008 Seth Vidal <skvidal at fedoraproject.org>
```
- add repodiff
```
Thu Jan 03 2008 Tim Lauridsen <timlau@fedoraproject.org>
```
- mark as 1.1.10
```