[interactive-markers] 01/03: Imported Upstream version 1.11.1

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository interactive-markers.

commit 129637f2cb132e87617d0d1d8eb978d4591200d2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Aug 4 22:09:46 2015 +0200

    Imported Upstream version 1.11.1
---
 CHANGELOG.rst                                        | 12 +++++++++---
 package.xml                                          |  4 ++--
 src/interactive_markers/interactive_marker_server.py |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4155b0d..1c31b30 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,9 @@
 Changelog for package interactive_markers
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-1.10.3 (2014-12-16)
+1.11.1 (2014-12-16)
 -------------------
+* Added explicit keyword argument queue_size for publisher in Python code and use the same default queue_size value as C++.
 * Fixed a SEGFAULT in setPose reported in `#18 <https://github.com/ros-visualization/interactive_markers/issues/18>`_
   Previously, calling setPose() on an interactive marker causes a SEGFAULT
   if applyChanges() was not called on the server at least once since the
@@ -12,9 +13,14 @@ Changelog for package interactive_markers
   in this case, marker_context_it = marker_contexts\_.end().
   I added a check for this case and, if there is no marker is present,
   instead use the header from the pending update.
-* Addressed some threading related bugs.
+* Contributors: David Gossow, Mike Koval, William Woodall, ipa-fxm
+
+1.11.0 (2014-02-24)
+-------------------
+* Adding William Woodall as maintainer
+* fix threading bugs
   Fix locking of data structures shared across threads.
-* Contributors: Acorn Pooley, Mike Koval, William Woodall, hersh
+* Contributors: Acorn Pooley, William Woodall, hersh
 
 1.10.2 (2014-02-03)
 -------------------
diff --git a/package.xml b/package.xml
index 8d73411..c6089a5 100644
--- a/package.xml
+++ b/package.xml
@@ -3,9 +3,9 @@
   <description>
      3D interactive marker communication library for RViz and similar tools.
   </description>
-  <maintainer email="dgossow at willowgarage.com">David Gossow</maintainer>
+  <maintainer email="william at osrfoundation.org">William Woodall</maintainer>
   <license>BSD</license>  
-  <version>1.10.3</version>
+  <version>1.11.1</version>
 
   <author>David Gossow</author>
 
diff --git a/src/interactive_markers/interactive_marker_server.py b/src/interactive_markers/interactive_marker_server.py
index b39ea48..542fab3 100644
--- a/src/interactive_markers/interactive_marker_server.py
+++ b/src/interactive_markers/interactive_marker_server.py
@@ -94,8 +94,8 @@ class InteractiveMarkerServer:
         # string : UpdateContext
         self.pending_updates = dict()
 
-        self.init_pub = rospy.Publisher(topic_ns+"/update_full", InteractiveMarkerInit, latch=True)
-        self.update_pub = rospy.Publisher(topic_ns+"/update", InteractiveMarkerUpdate)
+        self.init_pub = rospy.Publisher(topic_ns+"/update_full", InteractiveMarkerInit, latch=True, queue_size=100)
+        self.update_pub = rospy.Publisher(topic_ns+"/update", InteractiveMarkerUpdate, queue_size=100)
 
         rospy.Subscriber(topic_ns+"/feedback", InteractiveMarkerFeedback, self.processFeedback, queue_size=q_size)
         rospy.Timer(rospy.Duration(0.5), self.keepAlive)

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