[tango] 03/08: Merge branch 'upstream' into master
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Feb 29 08:05:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit 67bf1a36506973c65108759d0ff0ea3e13073cc1
Merge: 9b99f31 48fb99c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sat Feb 27 16:09:00 2016 +0100
Merge branch 'upstream' into master
README | 80 +-
TANGO_CHANGES | 45 +
configure | 25 +-
configure.ac | 7 +-
cppserver/database/DataBase.cpp | 275 +-
cppserver/database/DataBase.h | 20 +-
cppserver/database/DataBaseClass.cpp | 40 +-
cppserver/database/DataBaseClass.h | 29 +-
cppserver/database/DataBaseStateMachine.cpp | 30 +-
cppserver/database/DataBaseUtils.cpp | 23 +-
cppserver/database/Makefile.am | 4 +-
cppserver/database/Makefile.in | 15 +-
cppserver/database/create_db.sql.in | 133 +-
cppserver/database/create_db_tables.sql.in | 4 +-
cppserver/database/stored_proc.sql.in | 10 +-
cppserver/database/update_db.sql.in | 121 -
cppserver/database/update_db7.sql.in | 31 +-
.../{update_db.sql.in => update_db8.sql.in} | 21 +-
cppserver/starter/Starter.cpp | 10 +-
cppserver/starter/StarterClass.cpp | 8 +-
cppserver/tangoaccesscontrol/DbUtils.cpp | 20 +-
cppserver/tangotest/TangoTest.cpp | 21 +-
doc/src/appendix/appendix.lyx | 23 +-
doc/src/started/started.lyx | 10 +-
doc/src/tango.lyx | 2 +-
doc/tango.pdf | 11389 ++++++++++---------
lib/cpp/client/DevicePipe.h | 20 +-
lib/cpp/client/accessproxy.cpp | 4 +-
lib/cpp/client/devapi_base.cpp | 27 +-
lib/cpp/client/devapi_pipe.cpp | 167 +-
lib/cpp/client/event.cpp | 6 +-
lib/cpp/client/notifdeventconsumer.cpp | 6 +-
lib/cpp/client/proxy_asyn.cpp | 35 +-
lib/cpp/client/zmqeventconsumer.cpp | 46 +-
lib/cpp/server/attrgetsetprop.cpp | 8 +-
lib/cpp/server/attribute.cpp | 1143 +-
lib/cpp/server/attribute.h | 36 +-
lib/cpp/server/attribute.tpp | 8 +-
lib/cpp/server/basiccommand.cpp | 8 +-
lib/cpp/server/blackbox.cpp | 16 +-
lib/cpp/server/command.cpp | 6 +-
lib/cpp/server/dev_event.cpp | 33 +-
lib/cpp/server/device.cpp | 46 +-
lib/cpp/server/device.h | 13 +-
lib/cpp/server/device_2.cpp | 18 +-
lib/cpp/server/device_3.cpp | 15 +-
lib/cpp/server/device_4.cpp | 12 +-
lib/cpp/server/device_5.cpp | 24 +-
lib/cpp/server/deviceclass.cpp | 110 +-
lib/cpp/server/deviceclass.h | 20 +-
lib/cpp/server/dserver.cpp | 42 +-
lib/cpp/server/dserverclass.cpp | 28 +-
lib/cpp/server/dserverpoll.cpp | 8 +-
lib/cpp/server/dserversignal.cpp | 6 +-
lib/cpp/server/eventcmds.cpp | 18 +-
lib/cpp/server/fwdattribute.cpp | 14 +-
lib/cpp/server/pipe.cpp | 8 +-
lib/cpp/server/pipe.h | 12 +-
lib/cpp/server/pollring.tpp | 13 +-
lib/cpp/server/pollthread.cpp | 9 +-
lib/cpp/server/subdev_diag.cpp | 6 +-
lib/cpp/server/tango_const.h | 7 +-
lib/cpp/server/templ_inst.cpp | 11 +-
lib/cpp/server/utils.h | 6 +-
lib/cpp/server/utils.tpp | 8 +-
lib/cpp/server/utils_spec.tpp | 8 +-
lib/cpp/server/w_attribute.cpp | 765 +-
lib/cpp/server/w_attribute.h | 11 +-
lib/cpp/server/w_attribute.tpp | 56 +-
lib/cpp/server/zmqeventsupplier.cpp | 62 +-
lib/java/Makefile.am | 14 +-
lib/java/Makefile.in | 14 +-
pogo/preferences/common_target.opt | 54 +-
pogo/preferences/tango.opt.in | 8 +-
pogo/templates/cpp/Makefile | 6 +-
75 files changed, 7516 insertions(+), 7901 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list