[Python-modules-commits] [pylibmc] 14/18: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository pylibmc.

commit 4fbfbd6e758c32a129356bff2f012100e45c85d5
Merge: 9e93149 daf99b7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jul 24 13:40:21 2017 +0200

    merge patched into master

 MANIFEST.in                                        |   2 +-
 PKG-INFO                                           |   3 +-
 debian/.git-dpm                                    |   6 +-
 ...lling-of-occurred-in-src-_pylibmcmodule.c.patch |   8 +-
 docs/failover.svg                                  | 130 ++++++++++++++++++
 docs/install.rst                                   |   2 +-
 docs/reference.rst                                 |  18 +--
 setup.py                                           |   1 +
 src/_pylibmcmodule.c                               | 152 +++++++++------------
 src/_pylibmcmodule.h                               |  25 ++--
 src/pylibmc-version.h                              |   2 +-
 src/pylibmc/__init__.py                            |  11 +-
 src/pylibmc/client.py                              |   8 +-
 tests/test_client.py                               |  17 +++
 tests/test_refcounts.py                            |  19 +++
 tests/test_serialization.py                        |   3 +-
 16 files changed, 274 insertions(+), 133 deletions(-)

diff --cc debian/.git-dpm
index b907fe3,0000000..4486739
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
- 1c6f9bad069718a7d24ab79e9964e1f5b59dc8be
- 1c6f9bad069718a7d24ab79e9964e1f5b59dc8be
- d0a53287b0569ae242ee13f312f542270878c1f6
++daf99b7f6a876d506a180a2fca1a6ddc4257488c
++daf99b7f6a876d506a180a2fca1a6ddc4257488c
++01fa087f70b0369acfe51309e5579c75072f0964
 +01fa087f70b0369acfe51309e5579c75072f0964
 +pylibmc_1.5.2.orig.tar.gz
 +571e69d94c869bde970dcecb34fd14db2d1bb3b0
 +62262
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-spelling-of-occurred-in-src-_pylibmcmodule.c.patch
index db32612,0000000..092dadb
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-spelling-of-occurred-in-src-_pylibmcmodule.c.patch
+++ b/debian/patches/0001-Fix-spelling-of-occurred-in-src-_pylibmcmodule.c.patch
@@@ -1,31 -1,0 +1,31 @@@
- From 1c6f9bad069718a7d24ab79e9964e1f5b59dc8be Mon Sep 17 00:00:00 2001
++From daf99b7f6a876d506a180a2fca1a6ddc4257488c Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Fri, 27 May 2016 10:02:02 +0200
 +Subject: Fix spelling of "occurred" in src/_pylibmcmodule.c.
 +
 +---
 + src/_pylibmcmodule.c | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
- index 1372144..df6fd7d 100644
++index 1ce5a6a..642c020 100644
 +--- a/src/_pylibmcmodule.c
 ++++ b/src/_pylibmcmodule.c
- @@ -1685,7 +1685,7 @@ memcached_return pylibmc_memcached_fetch_multi(memcached_st *mc, pylibmc_mget_re
++@@ -1687,7 +1687,7 @@ memcached_return pylibmc_memcached_fetch_multi(memcached_st *mc, pylibmc_mget_re
 +      * Takes a set of keys given by *keys*, and stuffs the results into heap
 +      * memory returned by *results*.
 +      *
 +-     * If an error occured during retrieval, this function returns
 ++     * If an error occurred during retrieval, this function returns
 +      * non-MEMCACHED_SUCCESS and *err_func* will point to a useful error
 +      * function name.
 +      *
- @@ -2351,7 +2351,7 @@ static PyObject *PylibMC_Client_get_stats(PylibMC_Client *self, PyObject *args)
++@@ -2325,7 +2325,7 @@ static PyObject *PylibMC_Client_get_stats(PylibMC_Client *self, PyObject *args)
 + 
 +     if (rc != MEMCACHED_SUCCESS) {
 +         if (!PyErr_Occurred())
 +-            PyErr_SetString(PyExc_RuntimeError, "unknown error occured");
 ++            PyErr_SetString(PyExc_RuntimeError, "unknown error occurred");
 +         Py_DECREF(context.retval);
 +         context.retval = NULL;
 +     }

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