[Python-modules-commits] [asyncpg] 03/04: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository asyncpg.

commit a177f4e9c80ddc09eeaeb8a42c8271d017d6de44
Merge: 6e4e481 49e86aa
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Nov 29 12:31:08 2016 +0100

    merge patched into master

 Makefile                                           |    2 +-
 PKG-INFO                                           |    3 +-
 asyncpg.egg-info/PKG-INFO                          |    3 +-
 asyncpg/cluster.py                                 |    5 +-
 asyncpg/connection.py                              |   21 +
 asyncpg/introspection.py                           |    2 +
 asyncpg/protocol/codecs/array.pyx                  |   51 +-
 asyncpg/protocol/codecs/base.pyx                   |   15 +-
 asyncpg/protocol/codecs/network.pyx                |   12 +-
 asyncpg/protocol/coreproto.pxd                     |   20 +-
 asyncpg/protocol/coreproto.pyx                     |  102 +-
 asyncpg/protocol/prepared_stmt.pyx                 |   10 +-
 asyncpg/protocol/protocol.c                        | 9907 ++++++++++++--------
 asyncpg/protocol/protocol.pyx                      |   41 +-
 asyncpg/protocol/record/recordobj.c                |    6 +-
 debian/.git-dpm                                    |    6 +-
 ...fix-parsing-pg_ctl-output-in-some-locales.patch |   22 -
 debian/patches/series                              |    1 -
 setup.cfg                                          |    2 +-
 setup.py                                           |   14 +-
 tests/test_codecs.py                               |  102 +-
 tests/test_execute.py                              |   35 +
 tests/test_prepare.py                              |    5 +
 tests/test_record.py                               |   37 +-
 24 files changed, 6597 insertions(+), 3827 deletions(-)

diff --cc debian/.git-dpm
index 7a6ca79,0000000..2414eeb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 60fa6c3dc45d2c9168fcbc5fe7fcf20e66bd2ce5
- 60fa6c3dc45d2c9168fcbc5fe7fcf20e66bd2ce5
- 161aca35666bdda7a645ec6894c1fd5940edb44e
++49e86aafb0751371624f9aea94d029f6483128a0
++49e86aafb0751371624f9aea94d029f6483128a0
++49e86aafb0751371624f9aea94d029f6483128a0
 +49e86aafb0751371624f9aea94d029f6483128a0
 +asyncpg_0.7.0.orig.tar.gz
 +a5da412267f1b832898371ab1afe61ab552acf08
 +361918
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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