[tango] 16/21: Merge branch 'upstream'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit 522a10b8fc93a7838023882f6e05390c92e191a8
Merge: f55a000 b38e195
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Oct 8 14:57:56 2015 +0200

    Merge branch 'upstream'

 README                                    |  30 +--
 TANGO_CHANGES                             |   4 +-
 configure                                 |  43 +++-
 configure.ac                              |   3 +-
 cppserver/database/DataBase.cpp           |  31 +--
 cppserver/database/DataBaseClass.cpp      |   4 +-
 cppserver/database/Makefile.am            |   4 +-
 cppserver/database/Makefile.in            |  11 +-
 cppserver/database/rem_history.sql.in     |  26 +++
 cppserver/database/update_db.sql.in       |   6 +
 doc/src/advanced/alarm.eps                |  66 +++---
 doc/src/appendix/appendix.lyx             |   2 +-
 doc/src/dance/Ready.eps                   |  53 ++---
 doc/src/ds_model/event_schematic_zmq.eps  |  32 +--
 doc/src/ds_writing/command.eps            | 200 +++++++----------
 doc/src/ds_writing/complete_server.eps    | 137 +++++-------
 doc/src/ds_writing/device_et.eps          |  88 +++-----
 doc/src/ds_writing/r_attribute.eps        |  72 +++----
 doc/src/ds_writing/r_pipe.eps             |  22 +-
 doc/src/ds_writing/startup.eps            |   4 +-
 doc/src/ds_writing/w_attribute.eps        |  24 +--
 doc/src/ds_writing/w_pipe.eps             |  22 +-
 doc/src/gen_api/genapi.lyx                |   4 +-
 doc/src/gen_api/pipe.eps                  |  48 ++---
 doc/src/java_api/picture/NewLine.eps      |  54 ++---
 doc/src/java_api/picture/architerture.eps |   0
 doc/tango.pdf                             | Bin 2124820 -> 2356385 bytes
 lib/cpp/client/devapi_base.cpp            |   9 +-
 lib/cpp/client/eventconsumer.h            |   2 +-
 lib/cpp/client/eventkeepalive.cpp         |  87 +++++++-
 lib/cpp/client/zmq.hpp                    | 343 ++++--------------------------
 lib/cpp/server/attrdesc.cpp               |  33 ++-
 lib/cpp/server/attrdesc.h                 |  13 +-
 lib/cpp/server/attrgetsetprop.cpp         |  50 +++--
 lib/cpp/server/attribute.cpp              |  19 +-
 lib/cpp/server/device.cpp                 |   6 +-
 lib/cpp/server/eventsupplier.cpp          |   6 +-
 lib/cpp/server/fwdattrdesc.cpp            |  15 +-
 lib/cpp/server/fwdattrdesc.h              |   7 +-
 lib/cpp/server/fwdattribute.tpp           |   6 +-
 lib/cpp/server/idl/Makefile.am            |  10 +-
 lib/cpp/server/idl/Makefile.in            |  10 +-
 lib/cpp/server/multiattribute.cpp         |  16 +-
 lib/cpp/server/multiattribute.h           |   6 +-
 lib/cpp/server/pollthread.cpp             |   8 +-
 lib/cpp/server/rootattreg.cpp             |  83 +++++++-
 lib/cpp/server/rootattreg.h               |   7 +-
 lib/cpp/server/tango_config.h             |  12 +-
 lib/cpp/server/tango_const.h              |  14 +-
 lib/cpp/server/tangoappender.cpp          |  10 +-
 lib/cpp/server/tangoappender.h            |   5 +-
 lib/cpp/server/templ_inst.cpp             |  18 +-
 lib/cpp/server/utils.cpp                  |  19 +-
 lib/cpp/server/utils_polling.cpp          |   5 +-
 lib/cpp/server/zmqeventsupplier.cpp       |  13 ++
 lib/cpp/tango.pc.in                       |   2 +-
 lib/java/Makefile.am                      |  12 +-
 lib/java/Makefile.in                      |  12 +-
 pogo/templates/cpp/Makefile               |   6 +-
 59 files changed, 882 insertions(+), 972 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git