[Python-modules-commits] [lazr.config] 02/04: record new upstream branch created by importing lazr.config_2.1.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 lazr.config.

commit 04af7ba8d412ab6d5156d7d3c99646cbc646c45e
Merge: 59c1d62 cef48e9
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Fri Jan 9 15:53:28 2015 -0500

    record new upstream branch created by importing lazr.config_2.1.orig.tar.gz and merge it

 PKG-INFO                          |  2 +-
 conf.py                           |  2 +-
 debian/.git-dpm                   | 14 +++++++-------
 lazr.config.egg-info/PKG-INFO     |  2 +-
 lazr/__init__.py                  | 20 ++++++++------------
 lazr/config/__init__.py           |  2 +-
 lazr/config/_config.py            | 12 ++++++++++--
 lazr/config/docs/NEWS.rst         | 20 +++++++-------------
 lazr/config/docs/fixture.py       |  2 +-
 lazr/config/docs/usage.rst        |  1 -
 lazr/config/docs/usage_fixture.py |  2 +-
 lazr/config/interfaces.py         |  2 +-
 lazr/config/tests/test_config.py  | 16 +++++++++++++++-
 lazr/config/version.txt           |  2 +-
 setup.py                          |  6 +-----
 15 files changed, 56 insertions(+), 49 deletions(-)

diff --cc debian/.git-dpm
index 82db491,0000000..fef86eb
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
- db1ae2507d5586a831c65714600d1b0a1d136695
- db1ae2507d5586a831c65714600d1b0a1d136695
- db1ae2507d5586a831c65714600d1b0a1d136695
- db1ae2507d5586a831c65714600d1b0a1d136695
- lazr.config_2.0.1.orig.tar.gz
- 895c3c8ef9a55d56fa6598c3e09141e0129867dc
- 31030
++cef48e96be9d938f32ac3204c10c03577cf567da
++cef48e96be9d938f32ac3204c10c03577cf567da
++cef48e96be9d938f32ac3204c10c03577cf567da
++cef48e96be9d938f32ac3204c10c03577cf567da
++lazr.config_2.1.orig.tar.gz
++4015837f1ba943a23abf6ea3ad7285f18e5e1a50
++31232

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