[Python-modules-commits] [python-cachecontrol] 02/03: record new upstream branch created by importing python-cachecontrol_0.11.5.orig.tar.gz and merge it

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-cachecontrol.

commit 7880208f9a2b2ebb8afa3f44a2c235c1a0a1f8ed
Merge: 2da94f1 b6e96a6
Author: Barry Warsaw <barry at python.org>
Date:   Mon Jun 1 15:02:23 2015 -0400

    record new upstream branch created by importing python-cachecontrol_0.11.5.orig.tar.gz and merge it

 CacheControl.egg-info/PKG-INFO     |  2 +-
 CacheControl.egg-info/requires.txt |  2 +-
 PKG-INFO                           |  2 +-
 cachecontrol/__init__.py           |  2 +-
 cachecontrol/caches/file_cache.py  | 19 ++++++++++++++++---
 debian/.git-dpm                    | 14 +++++++-------
 setup.py                           |  4 ++--
 7 files changed, 29 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 8d52357,0000000..128e76e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 9ea7cfb1b474839c21271e8d8a8b92bcdfecd3b8
- 9ea7cfb1b474839c21271e8d8a8b92bcdfecd3b8
- 9ea7cfb1b474839c21271e8d8a8b92bcdfecd3b8
- 9ea7cfb1b474839c21271e8d8a8b92bcdfecd3b8
- python-cachecontrol_0.11.4.orig.tar.gz
- 178d0d36c40974f79c45dab3ac60192957d773e1
- 13019
++b6e96a62dc9ba104fccec9a5693d4a1be64ccb3a
++b6e96a62dc9ba104fccec9a5693d4a1be64ccb3a
++b6e96a62dc9ba104fccec9a5693d4a1be64ccb3a
++b6e96a62dc9ba104fccec9a5693d4a1be64ccb3a
++python-cachecontrol_0.11.5.orig.tar.gz
++3173a4ede3bb31aaf9117e35cdad55277f4ea0ee
++13104

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-cachecontrol.git