[yum-git] 2 commits - ChangeLog yum/__init__.py yum.spec

[Seth Vidal]

 ChangeLog       |   13 +++++++++++++
 yum.spec        |    5 ++++-
 yum/__init__.py |    2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 384fa8fec812c2ab0964591a7ffa36d9d52fd46d
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed May 14 22:04:58 2008 -0400

    merge changelog

diff --git a/ChangeLog b/ChangeLog
index 809b011..44051db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2008-05-14  Seth Vidal <skvidal at fedoraproject.org>
 
+	* yum.spec, yum/__init__.py: mark as 3.2.16
+
+2008-05-14  James Antill <james at and.org>
+
+	* yum/transactioninfo.py: Don't install things that are already
+	installed ... updates also work
+
+2008-05-14  Seth Vidal <skvidal at fedoraproject.org>
+
+	* ChangeLog: merge changelog
+
+2008-05-14  Seth Vidal <skvidal at fedoraproject.org>
+
 	* yum.spec, yum/__init__.py: mark as 3.2.15
 
 2008-05-14  James Antill <james at and.org>
commit 511518a67820328d02b357bbea9eab0eaeebc402
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed May 14 22:04:34 2008 -0400

    mark as 3.2.16

diff --git a/yum.spec b/yum.spec
index 1ca50c5..8ad25e6 100644
--- a/yum.spec
+++ b/yum.spec
@@ -1,6 +1,6 @@
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.15
+Version: 3.2.16
 Release: 0
 License: GPL
 Group: System Environment/Base
@@ -100,6 +100,9 @@ exit 0
 
 %changelog
 * Wed May 14 2008 Seth Vidal <skvidal at fedoraproject.org>
+-  3.2.16
+
+* Wed May 14 2008 Seth Vidal <skvidal at fedoraproject.org>
 - 3.2.15
 
 * Mon Apr  7 2008 Seth Vidal <skvidal at fedoraproject.org>
diff --git a/yum/__init__.py b/yum/__init__.py
index ff9d3be..cd75ced 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -72,7 +72,7 @@ import string
 
 from urlgrabber.grabber import default_grabber
 
-__version__ = '3.2.15'
+__version__ = '3.2.16'
 
 #  Setup a default_grabber UA here that says we are yum, done using the global
 # so that other API users can easily add to it if they want.