[Python-modules-commits] [pymodbus] 02/03: Merge tag 'upstream/1.3.2'

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository pymodbus.

commit bfc2e3d1f8fb3bad24238c727481dd502dedcdf0
Merge: 93a96f2 3875bc9
Author: W. Martin Borgert <debacle at debian.org>
Date:   Mon Aug 28 00:10:33 2017 +0200

    Merge tag 'upstream/1.3.2'

 .gitignore                               |  2 +-
 CHANGELOG.rst                            |  9 ++++
 README.rst                               |  5 +-
 examples/common/callback-server.py       |  6 ++-
 examples/common/device-mapping           |  2 +
 examples/common/modbus-payload-server.py |  8 +--
 examples/common/modbus-payload.py        | 15 ++++--
 examples/common/performance.py           | 11 ++--
 pymodbus/client/sync.py                  |  5 +-
 pymodbus/diag_message.py                 | 40 ++++++++++++--
 pymodbus/exceptions.py                   | 14 ++---
 pymodbus/other_message.py                |  2 +-
 pymodbus/payload.py                      |  8 +++
 pymodbus/server/sync.py                  | 92 ++++++++++++++++++--------------
 pymodbus/transaction.py                  | 88 +++++++++++++++++++++++-------
 pymodbus/version.py                      |  3 +-
 test/test_client_sync.py                 |  7 +++
 test/test_diag_messages.py               | 16 +++---
 test/test_other_messages.py              |  5 +-
 test/test_payload.py                     | 10 +++-
 test/test_server_sync.py                 | 27 ++++++----
 21 files changed, 266 insertions(+), 109 deletions(-)

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