[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'tom/ctrlport/mutexes'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fdfece16643f4f997cdbbd14a8646ae5f417e258
Merge: 3b14ca9 621c086
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 16 08:00:08 2015 -0700

    Merge remote-tracking branch 'tom/ctrlport/mutexes'

 gnuradio-runtime/include/gnuradio/rpcbufferedget.h |  3 +-
 .../include/gnuradio/rpcserver_booter_thrift.h     |  3 +-
 .../include/gnuradio/rpcserver_thrift.h            |  3 +
 .../include/gnuradio/thrift_application_base.h     |  7 +-
 .../include/gnuradio/thrift_server_template.h      | 87 +++++++++----------
 gnuradio-runtime/lib/controlport/thrift/README     | 41 +++++++++
 .../controlport/thrift/rpcserver_booter_thrift.cc  | 14 ++--
 .../lib/controlport/thrift/rpcserver_thrift.cc     |  8 ++
 .../thrift/thrift-codebase-shutdown-patch.diff     | 98 ++++++++++++++++++++++
 9 files changed, 201 insertions(+), 63 deletions(-)