[ros-ros-comm] 02/05: Imported Upstream version 1.11.16

Riku Voipio riku at moszumanska.debian.org
Tue Nov 10 14:06:03 UTC 2015


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

riku pushed a commit to branch master
in repository ros-ros-comm.

commit 6191577f5e1c170c6c7daa23d6e1ed23a1e50643
Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Tue Nov 10 16:02:16 2015 +0200

    Imported Upstream version 1.11.16
---
 clients/roscpp/CHANGELOG.rst                 |  4 ++++
 clients/roscpp/include/ros/init.h            | 10 ++++++++++
 clients/roscpp/package.xml                   |  2 +-
 clients/roscpp/src/libros/init.cpp           | 14 ++++++++++++++
 clients/rospy/CHANGELOG.rst                  |  4 ++++
 clients/rospy/package.xml                    |  2 +-
 clients/rospy/src/rospy/timer.py             |  7 ++++++-
 ros_comm/CHANGELOG.rst                       |  3 +++
 ros_comm/package.xml                         |  2 +-
 test/test_rosbag/package.xml                 |  2 +-
 test/test_rosbag_storage/package.xml         |  2 +-
 test/test_roscpp/package.xml                 |  2 +-
 test/test_rosgraph/package.xml               |  2 +-
 test/test_roslaunch/package.xml              |  2 +-
 test/test_roslib_comm/package.xml            |  2 +-
 test/test_rosmaster/package.xml              |  2 +-
 test/test_rosparam/package.xml               |  2 +-
 test/test_rospy/package.xml                  |  2 +-
 test/test_rosservice/package.xml             |  2 +-
 test/test_rostopic/package.xml               |  2 +-
 tools/rosbag/CHANGELOG.rst                   |  4 ++++
 tools/rosbag/package.xml                     |  2 +-
 tools/rosbag/src/rosbag/rosbag_main.py       |  2 +-
 tools/rosbag_storage/CHANGELOG.rst           |  3 +++
 tools/rosbag_storage/package.xml             |  2 +-
 tools/rosconsole/CHANGELOG.rst               |  3 +++
 tools/rosconsole/package.xml                 |  2 +-
 tools/rosgraph/CHANGELOG.rst                 |  3 +++
 tools/rosgraph/package.xml                   |  2 +-
 tools/roslaunch/CHANGELOG.rst                |  5 +++++
 tools/roslaunch/package.xml                  |  6 +++---
 tools/roslaunch/scripts/roscore              |  7 +++++++
 tools/roslaunch/src/roslaunch/__init__.py    | 13 +++++++++++--
 tools/roslaunch/src/roslaunch/launch.py      | 14 +++++++++++---
 tools/roslaunch/src/roslaunch/nodeprocess.py | 14 +++++++++++---
 tools/roslaunch/src/roslaunch/parent.py      | 12 ++++++++++--
 tools/rosmaster/CHANGELOG.rst                |  4 ++++
 tools/rosmaster/package.xml                  |  2 +-
 tools/rosmaster/src/rosmaster/main.py        | 15 ++++++++++++++-
 tools/rosmaster/src/rosmaster/master.py      |  5 +++--
 tools/rosmaster/src/rosmaster/master_api.py  |  4 ++--
 tools/rosmsg/CHANGELOG.rst                   |  3 +++
 tools/rosmsg/package.xml                     |  2 +-
 tools/rosnode/CHANGELOG.rst                  |  3 +++
 tools/rosnode/package.xml                    |  2 +-
 tools/rosout/CHANGELOG.rst                   |  3 +++
 tools/rosout/package.xml                     |  2 +-
 tools/rosparam/CHANGELOG.rst                 |  3 +++
 tools/rosparam/package.xml                   |  2 +-
 tools/rosservice/CHANGELOG.rst               |  3 +++
 tools/rosservice/package.xml                 |  2 +-
 tools/rostest/CHANGELOG.rst                  |  3 +++
 tools/rostest/package.xml                    |  2 +-
 tools/rostopic/CHANGELOG.rst                 |  3 +++
 tools/rostopic/package.xml                   |  2 +-
 tools/rostopic/src/rostopic/__init__.py      |  8 ++++----
 tools/topic_tools/CHANGELOG.rst              |  3 +++
 tools/topic_tools/package.xml                |  2 +-
 utilities/message_filters/CHANGELOG.rst      |  3 +++
 utilities/message_filters/package.xml        |  2 +-
 utilities/roslz4/CHANGELOG.rst               |  3 +++
 utilities/roslz4/package.xml                 |  2 +-
 utilities/roswtf/CHANGELOG.rst               |  3 +++
 utilities/roswtf/package.xml                 |  2 +-
 utilities/xmlrpcpp/CHANGELOG.rst             |  3 +++
 utilities/xmlrpcpp/package.xml               |  2 +-
 66 files changed, 207 insertions(+), 55 deletions(-)

diff --git a/clients/roscpp/CHANGELOG.rst b/clients/roscpp/CHANGELOG.rst
index 7a546ad..ed1698e 100644
--- a/clients/roscpp/CHANGELOG.rst
+++ b/clients/roscpp/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package roscpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+* add getROSArg function (`#694 <https://github.com/ros/ros_comm/pull/694>`_)
+
 1.11.15 (2015-10-13)
 --------------------
 * fix crash in onRetryTimer() callback (`#577 <https://github.com/ros/ros_comm/issues/577>`_)
diff --git a/clients/roscpp/include/ros/init.h b/clients/roscpp/include/ros/init.h
index 093b03e..02e84c3 100644
--- a/clients/roscpp/include/ros/init.h
+++ b/clients/roscpp/include/ros/init.h
@@ -196,6 +196,16 @@ ROSCPP_DECL bool isStarted();
 ROSCPP_DECL CallbackQueue* getGlobalCallbackQueue();
 
 /**
+ * \brief searches the command line arguments for the given arg parameter. In case this argument is not found
+ * an empty string is returned.
+ *
+ * \param argc the number of command-line arguments
+ * \param argv the command-line arguments
+ * \param arg argument to search for
+ */
+ROSCPP_DECL std::string getROSArg(int argc, const char* const* argv, const std::string& arg);
+
+/**
  * \brief returns a vector of program arguments that do not include any ROS remapping arguments.  Useful if you need
  * to parse your arguments to determine your node name
  *
diff --git a/clients/roscpp/package.xml b/clients/roscpp/package.xml
index b51b803..1cfed19 100644
--- a/clients/roscpp/package.xml
+++ b/clients/roscpp/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>roscpp</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     roscpp is a C++ implementation of ROS. It provides
     a <a href="http://www.ros.org/wiki/Client%20Libraries">client
diff --git a/clients/roscpp/src/libros/init.cpp b/clients/roscpp/src/libros/init.cpp
index 892de30..1435d02 100644
--- a/clients/roscpp/src/libros/init.cpp
+++ b/clients/roscpp/src/libros/init.cpp
@@ -509,6 +509,20 @@ void init(const VP_string& remappings, const std::string& name, uint32_t options
   init(remappings_map, name, options);
 }
 
+std::string getROSArg(int argc, const char* const* argv, const std::string& arg)
+{
+  for (int i = 0; i < argc; ++i)
+  {
+    std::string str_arg = argv[i];
+    size_t pos = str_arg.find(":=");
+    if (str_arg.substr(0,pos) == arg)
+    {
+      return str_arg.substr(pos+2);
+    }
+  }
+  return "";
+}
+
 void removeROSArgs(int argc, const char* const* argv, V_string& args_out)
 {
   for (int i = 0; i < argc; ++i)
diff --git a/clients/rospy/CHANGELOG.rst b/clients/rospy/CHANGELOG.rst
index 4515c84..0bdb034 100644
--- a/clients/rospy/CHANGELOG.rst
+++ b/clients/rospy/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package rospy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+* catch ROSInterruptException from rospy timers when shutting down (`#690 <https://github.com/ros/ros_comm/pull/690>`_)
+
 1.11.15 (2015-10-13)
 --------------------
 * validate name after remapping (`#669 <https://github.com/ros/ros_comm/pull/669>`_)
diff --git a/clients/rospy/package.xml b/clients/rospy/package.xml
index 62461a0..8ad6f64 100644
--- a/clients/rospy/package.xml
+++ b/clients/rospy/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rospy</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rospy is a pure Python client library for ROS. The rospy client
     API enables Python programmers to quickly interface with ROS <a
diff --git a/clients/rospy/src/rospy/timer.py b/clients/rospy/src/rospy/timer.py
index e0197f6..5b91510 100644
--- a/clients/rospy/src/rospy/timer.py
+++ b/clients/rospy/src/rospy/timer.py
@@ -210,7 +210,12 @@ class Timer(threading.Thread):
         current_expected = rospy.rostime.get_rostime() + self._period
         last_expected, last_real, last_duration = None, None, None
         while not rospy.core.is_shutdown() and not self._shutdown:
-            r.sleep()
+            try:
+                r.sleep()
+            except rospy.exceptions.ROSInterruptException as e:
+                if rospy.core.is_shutdown():
+                    break
+                raise
             if self._shutdown:
                 break
             current_real = rospy.rostime.get_rostime()
diff --git a/ros_comm/CHANGELOG.rst b/ros_comm/CHANGELOG.rst
index 1b17cfc..493b26f 100644
--- a/ros_comm/CHANGELOG.rst
+++ b/ros_comm/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package ros_comm
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/ros_comm/package.xml b/ros_comm/package.xml
index c450796..5ac20f2 100644
--- a/ros_comm/package.xml
+++ b/ros_comm/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>ros_comm</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     ROS communications-related packages, including core client libraries (roscpp, rospy) and graph introspection tools (rostopic, rosnode, rosservice, rosparam).
   </description>
diff --git a/test/test_rosbag/package.xml b/test/test_rosbag/package.xml
index 03cb21f..0d86568 100644
--- a/test/test_rosbag/package.xml
+++ b/test/test_rosbag/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rosbag</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     A package containing the unit tests for rosbag.
   </description>
diff --git a/test/test_rosbag_storage/package.xml b/test/test_rosbag_storage/package.xml
index 3f4106c..250d5d2 100644
--- a/test/test_rosbag_storage/package.xml
+++ b/test/test_rosbag_storage/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rosbag_storage</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     A package containing the unit tests for rosbag_storage.
   </description>
diff --git a/test/test_roscpp/package.xml b/test/test_roscpp/package.xml
index 01c671a..006877e 100644
--- a/test/test_roscpp/package.xml
+++ b/test/test_roscpp/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_roscpp</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tests for roscpp which depend on rostest.
   </description>
diff --git a/test/test_rosgraph/package.xml b/test/test_rosgraph/package.xml
index 482194d..effdd77 100644
--- a/test/test_rosgraph/package.xml
+++ b/test/test_rosgraph/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rosgraph</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tests for rosgraph which depend on rostest.
   </description>
diff --git a/test/test_roslaunch/package.xml b/test/test_roslaunch/package.xml
index 3f94bf9..4570d09 100644
--- a/test/test_roslaunch/package.xml
+++ b/test/test_roslaunch/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_roslaunch</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tests for roslaunch which depend on rostest.
   </description>
diff --git a/test/test_roslib_comm/package.xml b/test/test_roslib_comm/package.xml
index 72d837a..50b66bc 100644
--- a/test/test_roslib_comm/package.xml
+++ b/test/test_roslib_comm/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_roslib_comm</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Unit tests verifying that roslib is operating as expected.
   </description>
diff --git a/test/test_rosmaster/package.xml b/test/test_rosmaster/package.xml
index 466fff7..c6a0f61 100644
--- a/test/test_rosmaster/package.xml
+++ b/test/test_rosmaster/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rosmaster</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tests for rosmaster which depend on rostest.
   </description>
diff --git a/test/test_rosparam/package.xml b/test/test_rosparam/package.xml
index c65c4f7..e1109bb 100644
--- a/test/test_rosparam/package.xml
+++ b/test/test_rosparam/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rosparam</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     A package containing the unit tests for rosparam.
   </description>
diff --git a/test/test_rospy/package.xml b/test/test_rospy/package.xml
index 0d0dfe3..418e40e 100644
--- a/test/test_rospy/package.xml
+++ b/test/test_rospy/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rospy</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rospy unit and integration test framework.
   </description>
diff --git a/test/test_rosservice/package.xml b/test/test_rosservice/package.xml
index 8224ca2..50d5851 100644
--- a/test/test_rosservice/package.xml
+++ b/test/test_rosservice/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rosservice</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tests for the rosservice tool.
   </description>
diff --git a/test/test_rostopic/package.xml b/test/test_rostopic/package.xml
index ddf8013..2a09b5a 100644
--- a/test/test_rostopic/package.xml
+++ b/test/test_rostopic/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_rostopic</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tests for rostopic.
   </description>
diff --git a/tools/rosbag/CHANGELOG.rst b/tools/rosbag/CHANGELOG.rst
index 22ed480..217f1be 100644
--- a/tools/rosbag/CHANGELOG.rst
+++ b/tools/rosbag/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package rosbag
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+* show size unit for --size of rosbag record in help string (`#697 <https://github.com/ros/ros_comm/pull/697>`_)
+
 1.11.15 (2015-10-13)
 --------------------
 * add option --prefix for prefixing output topics (`#626 <https://github.com/ros/ros_comm/pull/626>`_)
diff --git a/tools/rosbag/package.xml b/tools/rosbag/package.xml
index 8e74fff..81958e6 100644
--- a/tools/rosbag/package.xml
+++ b/tools/rosbag/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosbag</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     This is a set of tools for recording from and playing back to ROS
     topics.  It is intended to be high performance and avoids
diff --git a/tools/rosbag/src/rosbag/rosbag_main.py b/tools/rosbag/src/rosbag/rosbag_main.py
index 3120286..f75a496 100644
--- a/tools/rosbag/src/rosbag/rosbag_main.py
+++ b/tools/rosbag/src/rosbag/rosbag_main.py
@@ -77,7 +77,7 @@ def record_cmd(argv):
     parser.add_option("-o", "--output-prefix", dest="prefix",        default=None,  action="store",               help="prepend PREFIX to beginning of bag name (name will always end with date stamp)")
     parser.add_option("-O", "--output-name",   dest="name",          default=None,  action="store",               help="record to bag with name NAME.bag")
     parser.add_option(      "--split",         dest="split",         default=False, callback=handle_split, action="callback",    help="split the bag when maximum size or duration is reached")
-    parser.add_option(      "--size",          dest="size",                         type='int',   action="store", help="record a bag of maximum size SIZE", metavar="SIZE")
+    parser.add_option(      "--size",          dest="size",                         type='int',   action="store", help="record a bag of maximum size SIZE MB. (Default: infinite)", metavar="SIZE")
     parser.add_option(      "--duration",      dest="duration",                     type='string',action="store", help="record a bag of maximum duration DURATION in seconds, unless 'm', or 'h' is appended.", metavar="DURATION")
     parser.add_option("-b", "--buffsize",      dest="buffsize",      default=256,   type='int',   action="store", help="use an internal buffer of SIZE MB (Default: %default, 0 = infinite)", metavar="SIZE")
     parser.add_option("--chunksize",           dest="chunksize",     default=768,   type='int',   action="store", help="Advanced. Record to chunks of SIZE KB (Default: %default)", metavar="SIZE")
diff --git a/tools/rosbag_storage/CHANGELOG.rst b/tools/rosbag_storage/CHANGELOG.rst
index b471e3a..87cb30b 100644
--- a/tools/rosbag_storage/CHANGELOG.rst
+++ b/tools/rosbag_storage/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosbag_storage
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosbag_storage/package.xml b/tools/rosbag_storage/package.xml
index 61b660e..d189cf7 100644
--- a/tools/rosbag_storage/package.xml
+++ b/tools/rosbag_storage/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosbag_storage</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     This is a set of tools for recording from and playing back ROS
     message without relying on the ROS client library.
diff --git a/tools/rosconsole/CHANGELOG.rst b/tools/rosconsole/CHANGELOG.rst
index d9dfdb1..82ed9c0 100644
--- a/tools/rosconsole/CHANGELOG.rst
+++ b/tools/rosconsole/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosconsole
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosconsole/package.xml b/tools/rosconsole/package.xml
index d49ee4c..1b22d0b 100644
--- a/tools/rosconsole/package.xml
+++ b/tools/rosconsole/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosconsole</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>ROS console output library.</description>
   <maintainer email="dthomas at osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
diff --git a/tools/rosgraph/CHANGELOG.rst b/tools/rosgraph/CHANGELOG.rst
index 6bb0c65..db2b3f5 100644
--- a/tools/rosgraph/CHANGELOG.rst
+++ b/tools/rosgraph/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosgraph
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosgraph/package.xml b/tools/rosgraph/package.xml
index e3ea992..9c90915 100644
--- a/tools/rosgraph/package.xml
+++ b/tools/rosgraph/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosgraph</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rosgraph contains the rosgraph command-line tool, which prints
     information about the ROS Computation Graph. It also provides an
diff --git a/tools/roslaunch/CHANGELOG.rst b/tools/roslaunch/CHANGELOG.rst
index c6325e8..f2c8ebb 100644
--- a/tools/roslaunch/CHANGELOG.rst
+++ b/tools/roslaunch/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package roslaunch
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+* add `-w` and `-t` options (`#687 <https://github.com/ros/ros_comm/pull/687>`_)
+* fix missing minimum version for rospkg dependency (`#693 <https://github.com/ros/ros_comm/issues/693>`_)
+
 1.11.15 (2015-10-13)
 --------------------
 * improve performance by reusing the rospack instance across nodes with the same default environment (`#682 <https://github.com/ros/ros_comm/pull/682>`_)
diff --git a/tools/roslaunch/package.xml b/tools/roslaunch/package.xml
index 8170986..a65713f 100644
--- a/tools/roslaunch/package.xml
+++ b/tools/roslaunch/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>roslaunch</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     roslaunch is a tool for easily launching multiple ROS <a
     href="http://ros.org/wiki/Nodes">nodes</a> locally and remotely
@@ -21,12 +21,12 @@
   <buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
 
   <run_depend>python-paramiko</run_depend>
-  <run_depend>python-rospkg</run_depend>
+  <run_depend version_gte="1.0.37">python-rospkg</run_depend>
   <run_depend>python-yaml</run_depend>
   <run_depend>rosclean</run_depend>
   <run_depend>rosgraph_msgs</run_depend>
   <run_depend>roslib</run_depend>
-  <run_depend>rosmaster</run_depend>
+  <run_depend version_gte="1.11.16">rosmaster</run_depend>
   <run_depend>rosout</run_depend>
   <run_depend>rosparam</run_depend>
   <run_depend>rosunit</run_depend>
diff --git a/tools/roslaunch/scripts/roscore b/tools/roslaunch/scripts/roscore
index 04082af..8a48170 100755
--- a/tools/roslaunch/scripts/roscore
+++ b/tools/roslaunch/scripts/roscore
@@ -33,6 +33,7 @@
 
 import sys
 from optparse import OptionParser
+from rosmaster.master_api import NUM_WORKERS
 
 NAME = 'roscore'
 
@@ -49,6 +50,12 @@ def _get_optparse():
     parser.add_option("-v", action="store_true",
                       dest="verbose", default=False,
                       help="verbose printing")
+    parser.add_option("-w", "--numworkers",
+                      dest="num_workers", default=NUM_WORKERS, type=int,
+                      help="override number of worker threads", metavar="NUM_WORKERS")
+    parser.add_option("-t", "--timeout",
+                      dest="timeout",
+                      help="override the socket connection timeout (in seconds).", metavar="TIMEOUT")
     return parser
 
 
diff --git a/tools/roslaunch/src/roslaunch/__init__.py b/tools/roslaunch/src/roslaunch/__init__.py
index d04c053..8d75fbc 100644
--- a/tools/roslaunch/src/roslaunch/__init__.py
+++ b/tools/roslaunch/src/roslaunch/__init__.py
@@ -65,7 +65,9 @@ try:
     from rosmaster import DEFAULT_MASTER_PORT
 except:
     DEFAULT_MASTER_PORT = 11311
-    
+
+from rosmaster.master_api import NUM_WORKERS
+
 NAME = 'roslaunch'
 
 def configure_logging(uuid):
@@ -172,6 +174,12 @@ def _get_optparse():
     parser.add_option("--disable-title", default=False, action="store_true",
                       dest="disable_title",
                       help="Disable setting of terminal title")
+    parser.add_option("-w", "--numworkers",
+                      dest="num_workers", default=NUM_WORKERS, type=int,
+                      help="override number of worker threads. Only valid for core services.", metavar="NUM_WORKERS")
+    parser.add_option("-t", "--timeout",
+                      dest="timeout",
+                      help="override the socket connection timeout (in seconds). Only valid for core services.", metavar="TIMEOUT")
 
     return parser
     
@@ -294,7 +302,8 @@ def main(argv=sys.argv):
                     options.port = options.port or DEFAULT_MASTER_PORT
                 p = roslaunch_parent.ROSLaunchParent(uuid, args, roslaunch_strs=roslaunch_strs,
                         is_core=options.core, port=options.port, local_only=options.local_only,
-                        verbose=options.verbose, force_screen=options.force_screen)
+                        verbose=options.verbose, force_screen=options.force_screen,
+                        num_workers=options.num_workers, timeout=options.timeout)
                 p.start()
                 p.spin()
             finally:
diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py
index e67b2c4..758d6fe 100644
--- a/tools/roslaunch/src/roslaunch/launch.py
+++ b/tools/roslaunch/src/roslaunch/launch.py
@@ -57,6 +57,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener
 
 from roslaunch.rlutil import update_terminal_name
 
+from rosmaster.master_api import NUM_WORKERS
+
 _TIMEOUT_MASTER_START = 10.0 #seconds
 _TIMEOUT_MASTER_STOP  = 10.0 #seconds
 
@@ -233,7 +235,7 @@ class ROSLaunchRunner(object):
     monitored.
     """
     
-    def __init__(self, run_id, config, server_uri=None, pmon=None, is_core=False, remote_runner=None, is_child=False, is_rostest=False):
+    def __init__(self, run_id, config, server_uri=None, pmon=None, is_core=False, remote_runner=None, is_child=False, is_rostest=False, num_workers=NUM_WORKERS, timeout=None):
         """
         @param run_id: /run_id for this launch. If the core is not
             running, this value will be used to initialize /run_id. If
@@ -258,7 +260,11 @@ class ROSLaunchRunner(object):
         @param is_rostest: if True, this runner is a rostest
             instance. This affects certain validation checks.
         @type  is_rostest: bool
-        """            
+        @param num_workers: If this is the core, the number of worker-threads to use.
+        @type num_workers: int
+        @param timeout: If this is the core, the socket-timeout to use.
+        @type timeout: Float or None
+        """
         if run_id is None:
             raise RLException("run_id is None")
         self.run_id = run_id
@@ -273,6 +279,8 @@ class ROSLaunchRunner(object):
         self.is_child = is_child
         self.is_core = is_core
         self.is_rostest = is_rostest
+        self.num_workers = num_workers
+        self.timeout = timeout
         self.logger = logging.getLogger('roslaunch')
         self.pm = pmon or start_process_monitor()
 
@@ -386,7 +394,7 @@ class ROSLaunchRunner(object):
             validate_master_launch(m, self.is_core, self.is_rostest)
 
             printlog("auto-starting new master")
-            p = create_master_process(self.run_id, m.type, get_ros_root(), m.get_port())
+            p = create_master_process(self.run_id, m.type, get_ros_root(), m.get_port(), self.num_workers, self.timeout)
             self.pm.register_core_proc(p)
             success = p.start()
             if not success:
diff --git a/tools/roslaunch/src/roslaunch/nodeprocess.py b/tools/roslaunch/src/roslaunch/nodeprocess.py
index 2b641d2..8df5ce5 100644
--- a/tools/roslaunch/src/roslaunch/nodeprocess.py
+++ b/tools/roslaunch/src/roslaunch/nodeprocess.py
@@ -49,6 +49,8 @@ from roslaunch.core import *
 from roslaunch.node_args import create_local_process_args
 from roslaunch.pmon import Process, FatalProcessLaunch
 
+from rosmaster.master_api import NUM_WORKERS
+
 import logging
 _logger = logging.getLogger("roslaunch")
 
@@ -61,7 +63,7 @@ def _next_counter():
     _counter += 1
     return _counter
 
-def create_master_process(run_id, type_, ros_root, port):
+def create_master_process(run_id, type_, ros_root, port, num_workers=NUM_WORKERS, timeout=None):
     """
     Launch a master
     @param type_: name of master executable (currently just Master.ZENMASTER)
@@ -70,18 +72,24 @@ def create_master_process(run_id, type_, ros_root, port):
     @type  ros_root: str
     @param port: port to launch master on
     @type  port: int
+    @param num_workers: number of worker threads.
+    @type  num_workers: int
+    @param timeout: socket timeout for connections.
+    @type  timeout: float
     @raise RLException: if type_ or port is invalid
     """    
     if port < 1 or port > 65535:
         raise RLException("invalid port assignment: %s"%port)
 
-    _logger.info("create_master_process: %s, %s, %s", type_, ros_root, port)
+    _logger.info("create_master_process: %s, %s, %s, %s, %s", type_, ros_root, port, num_workers, timeout)
     # catkin/fuerte: no longer use ROS_ROOT-relative executables, search path instead
     master = type_
     # zenmaster is deprecated and aliased to rosmaster
     if type_ in [Master.ROSMASTER, Master.ZENMASTER]:        
         package = 'rosmaster'        
-        args = [master, '--core', '-p', str(port)]
+        args = [master, '--core', '-p', str(port), '-w', str(num_workers)]
+        if timeout is not None:
+            args += ['-t', str(timeout)]
     else:
         raise RLException("unknown master typ_: %s"%type_)
 
diff --git a/tools/roslaunch/src/roslaunch/parent.py b/tools/roslaunch/src/roslaunch/parent.py
index 11c6971..ac27b83 100644
--- a/tools/roslaunch/src/roslaunch/parent.py
+++ b/tools/roslaunch/src/roslaunch/parent.py
@@ -54,6 +54,8 @@ import roslaunch.pmon
 import roslaunch.server
 import roslaunch.xmlloader 
 
+from rosmaster.master_api import NUM_WORKERS
+
 #TODO: probably move process listener infrastructure into here
 
 # TODO: remove after wg_hardware_roslaunch has been updated
@@ -71,7 +73,7 @@ class ROSLaunchParent(object):
     """
 
     def __init__(self, run_id, roslaunch_files, is_core=False, port=None, local_only=False, process_listeners=None,
-            verbose=False, force_screen=False, is_rostest=False, roslaunch_strs=None):
+            verbose=False, force_screen=False, is_rostest=False, roslaunch_strs=None, num_workers=NUM_WORKERS, timeout=None):
         """
         @param run_id: UUID of roslaunch session
         @type  run_id: str
@@ -94,6 +96,10 @@ class ROSLaunchParent(object):
         @param is_rostest bool: if True, this launch is a rostest
             instance. This affects validation checks.
         @type  is_rostest: bool
+        @param num_workers: If this is the core, the number of worker-threads to use.
+        @type num_workers: int
+        @param timeout: If this is the core, the socket-timeout to use.
+        @type timeout: Float or None
         @throws RLException
         """
         
@@ -108,6 +114,8 @@ class ROSLaunchParent(object):
         self.port = port
         self.local_only = local_only
         self.verbose = verbose
+        self.num_workers = num_workers
+        self.timeout = timeout
 
         # I don't think we should have to pass in so many options from
         # the outside into the roslaunch parent. One possibility is to
@@ -144,7 +152,7 @@ class ROSLaunchParent(object):
             raise RLException("pm is not initialized")
         if self.server is None:
             raise RLException("server is not initialized")
-        self.runner = roslaunch.launch.ROSLaunchRunner(self.run_id, self.config, server_uri=self.server.uri, pmon=self.pm, is_core=self.is_core, remote_runner=self.remote_runner, is_rostest=self.is_rostest)
+        self.runner = roslaunch.launch.ROSLaunchRunner(self.run_id, self.config, server_uri=self.server.uri, pmon=self.pm, is_core=self.is_core, remote_runner=self.remote_runner, is_rostest=self.is_rostest, num_workers=self.num_workers, timeout=self.timeout)
 
         # print runner info to user, put errors last to make the more visible
         if self.is_core:
diff --git a/tools/rosmaster/CHANGELOG.rst b/tools/rosmaster/CHANGELOG.rst
index 9aac4a2..d5d4e52 100644
--- a/tools/rosmaster/CHANGELOG.rst
+++ b/tools/rosmaster/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package rosmaster
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+* add `-w` and `-t` options (`#687 <https://github.com/ros/ros_comm/pull/687>`_)
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosmaster/package.xml b/tools/rosmaster/package.xml
index f6b2d47..3723dbf 100644
--- a/tools/rosmaster/package.xml
+++ b/tools/rosmaster/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosmaster</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     ROS <a href="http://ros.org/wiki/Master">Master</a> implementation.
   </description>
diff --git a/tools/rosmaster/src/rosmaster/main.py b/tools/rosmaster/src/rosmaster/main.py
index 2eccb37..b18babd 100644
--- a/tools/rosmaster/src/rosmaster/main.py
+++ b/tools/rosmaster/src/rosmaster/main.py
@@ -41,6 +41,7 @@ import time
 import optparse
 
 import rosmaster.master
+from rosmaster.master_api import NUM_WORKERS
 
 def configure_logging():
     """
@@ -64,6 +65,12 @@ def rosmaster_main(argv=sys.argv, stdout=sys.stdout, env=os.environ):
     parser.add_option("-p", "--port", 
                       dest="port", default=0,
                       help="override port", metavar="PORT")
+    parser.add_option("-w", "--numworkers",
+                      dest="num_workers", default=NUM_WORKERS, type=int,
+                      help="override number of worker threads", metavar="NUM_WORKERS")
+    parser.add_option("-t", "--timeout",
+                      dest="timeout",
+                      help="override the socket connection timeout (in seconds).", metavar="TIMEOUT")
     options, args = parser.parse_args(argv[1:])
 
     # only arg that zenmaster supports is __log remapping of logfilename
@@ -95,9 +102,15 @@ WARNING ACHTUNG WARNING ACHTUNG WARNING
 
     logger = logging.getLogger("rosmaster.main")
     logger.info("initialization complete, waiting for shutdown")
+
+    if options.timeout is not None and float(options.timeout) >= 0.0:
+        logger.info("Setting socket timeout to %s" % options.timeout)
+        import socket
+        socket.setdefaulttimeout(float(options.timeout))
+
     try:
         logger.info("Starting ROS Master Node")
-        master = rosmaster.master.Master(port)
+        master = rosmaster.master.Master(port, options.num_workers)
         master.start()
 
         import time
diff --git a/tools/rosmaster/src/rosmaster/master.py b/tools/rosmaster/src/rosmaster/master.py
index 3899d3d..fc8652a 100644
--- a/tools/rosmaster/src/rosmaster/master.py
+++ b/tools/rosmaster/src/rosmaster/master.py
@@ -50,8 +50,9 @@ DEFAULT_MASTER_PORT=11311 #default port for master's to bind to
 
 class Master(object):
     
-    def __init__(self, port=DEFAULT_MASTER_PORT):
+    def __init__(self, port=DEFAULT_MASTER_PORT, num_workers=rosmaster.master_api.NUM_WORKERS):
         self.port = port
+        self.num_workers = num_workers
         
     def start(self):
         """
@@ -61,7 +62,7 @@ class Master(object):
         self.master_node = None
         self.uri = None
 
-        handler = rosmaster.master_api.ROSMasterHandler()
+        handler = rosmaster.master_api.ROSMasterHandler(self.num_workers)
         master_node = rosgraph.xmlrpc.XmlRpcNode(self.port, handler)
         master_node.start()
 
diff --git a/tools/rosmaster/src/rosmaster/master_api.py b/tools/rosmaster/src/rosmaster/master_api.py
index c59e84f..8d0afd3 100644
--- a/tools/rosmaster/src/rosmaster/master_api.py
+++ b/tools/rosmaster/src/rosmaster/master_api.py
@@ -236,13 +236,13 @@ class ROSMasterHandler(object):
     this parameter (see ros::client::getMaster()).
     """
     
-    def __init__(self):
+    def __init__(self, num_workers=NUM_WORKERS):
         """ctor."""
 
         self.uri = None
         self.done = False
 
-        self.thread_pool = rosmaster.threadpool.MarkedThreadPool(NUM_WORKERS)
+        self.thread_pool = rosmaster.threadpool.MarkedThreadPool(num_workers)
         # pub/sub/providers: dict { topicName : [publishers/subscribers names] }
         self.ps_lock = threading.Condition(threading.Lock())
 
diff --git a/tools/rosmsg/CHANGELOG.rst b/tools/rosmsg/CHANGELOG.rst
index 2aa303f..eaf7b9c 100644
--- a/tools/rosmsg/CHANGELOG.rst
+++ b/tools/rosmsg/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosmsg
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosmsg/package.xml b/tools/rosmsg/package.xml
index 79c2cd2..ab63676 100644
--- a/tools/rosmsg/package.xml
+++ b/tools/rosmsg/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosmsg</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rosmsg contains two command-line tools: <tt>rosmsg</tt> and
     <tt>rossrv</tt>. <tt>rosmsg</tt> is a command-line tool for
diff --git a/tools/rosnode/CHANGELOG.rst b/tools/rosnode/CHANGELOG.rst
index 37835bf..27a9fe6 100644
--- a/tools/rosnode/CHANGELOG.rst
+++ b/tools/rosnode/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosnode
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosnode/package.xml b/tools/rosnode/package.xml
index 0f53a49..c6c0750 100644
--- a/tools/rosnode/package.xml
+++ b/tools/rosnode/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosnode</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rosnode is a command-line tool for displaying debug information
     about ROS <a href="http://www.ros.org/wiki/Nodes">Nodes</a>,
diff --git a/tools/rosout/CHANGELOG.rst b/tools/rosout/CHANGELOG.rst
index 3369d46..84ff4cd 100644
--- a/tools/rosout/CHANGELOG.rst
+++ b/tools/rosout/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosout
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosout/package.xml b/tools/rosout/package.xml
index da4ad3f..0a93877 100644
--- a/tools/rosout/package.xml
+++ b/tools/rosout/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosout</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
      System-wide logging mechanism for messages sent to the /rosout topic.
   </description>
diff --git a/tools/rosparam/CHANGELOG.rst b/tools/rosparam/CHANGELOG.rst
index b474652..8290672 100644
--- a/tools/rosparam/CHANGELOG.rst
+++ b/tools/rosparam/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosparam
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosparam/package.xml b/tools/rosparam/package.xml
index fd2554b..49a56ca 100644
--- a/tools/rosparam/package.xml
+++ b/tools/rosparam/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosparam</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rosparam contains the rosparam command-line tool for getting and
     setting ROS Parameters on the <a
diff --git a/tools/rosservice/CHANGELOG.rst b/tools/rosservice/CHANGELOG.rst
index ba44da0..d5a4b4a 100644
--- a/tools/rosservice/CHANGELOG.rst
+++ b/tools/rosservice/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rosservice
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rosservice/package.xml b/tools/rosservice/package.xml
index 5a9331a..033651c 100644
--- a/tools/rosservice/package.xml
+++ b/tools/rosservice/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rosservice</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rosservice contains the rosservice command-line tool for listing
     and querying ROS <a
diff --git a/tools/rostest/CHANGELOG.rst b/tools/rostest/CHANGELOG.rst
index 739c24b..f5b38b4 100644
--- a/tools/rostest/CHANGELOG.rst
+++ b/tools/rostest/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rostest
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/rostest/package.xml b/tools/rostest/package.xml
index c0fac1e..8e8a48b 100644
--- a/tools/rostest/package.xml
+++ b/tools/rostest/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rostest</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
      Integration test suite based on roslaunch that is compatible with xUnit frameworks.
   </description>
diff --git a/tools/rostopic/CHANGELOG.rst b/tools/rostopic/CHANGELOG.rst
index 7b2077e..0e17ce0 100644
--- a/tools/rostopic/CHANGELOG.rst
+++ b/tools/rostopic/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package rostopic
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 * add warning to rostopic hz about simulated time (`#672 <https://github.com/ros/ros_comm/pull/672>`_)
diff --git a/tools/rostopic/package.xml b/tools/rostopic/package.xml
index 6ccd93c..c92add2 100644
--- a/tools/rostopic/package.xml
+++ b/tools/rostopic/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>rostopic</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     rostopic contains the rostopic command-line tool for displaying
     debug information about
diff --git a/tools/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py
index 354ea22..e2b42a4 100644
--- a/tools/rostopic/src/rostopic/__init__.py
+++ b/tools/rostopic/src/rostopic/__init__.py
@@ -187,10 +187,6 @@ def _rostopic_hz(topic, window_size=-1, filter_expr=None):
     :param window_size: number of messages to average over, -1 for infinite, ``int``
     :param filter_expr: Python filter expression that is called with m, the message instance
     """
-    if rospy.get_param('use_sim_time', False):
-        print("WARNING: topic [%s] may be using simulated time" % (topic),
-              file=sys.stderr)
-
     msg_class, real_topic, _ = get_topic_class(topic, blocking=True) #pause hz until topic is published
     if rospy.is_shutdown():
         return
@@ -204,6 +200,10 @@ def _rostopic_hz(topic, window_size=-1, filter_expr=None):
     else:
         sub = rospy.Subscriber(real_topic, rospy.AnyMsg, rt.callback_hz)        
     print("subscribed to [%s]"%real_topic)
+
+    if rospy.get_param('use_sim_time', False):
+        print("WARNING: may be using simulated time",file=sys.stderr)
+
     while not rospy.is_shutdown():
         _sleep(1.0)
         rt.print_hz()
diff --git a/tools/topic_tools/CHANGELOG.rst b/tools/topic_tools/CHANGELOG.rst
index 77ac532..aee5479 100644
--- a/tools/topic_tools/CHANGELOG.rst
+++ b/tools/topic_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package topic_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/tools/topic_tools/package.xml b/tools/topic_tools/package.xml
index d2a67c6..b8ce54f 100644
--- a/tools/topic_tools/package.xml
+++ b/tools/topic_tools/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>topic_tools</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     Tools for directing, throttling, selecting, and otherwise messing with
     ROS topics at a meta level. None of the programs in this package actually
diff --git a/utilities/message_filters/CHANGELOG.rst b/utilities/message_filters/CHANGELOG.rst
index 1d44851..954af89 100644
--- a/utilities/message_filters/CHANGELOG.rst
+++ b/utilities/message_filters/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package message_filters
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 * add unregister() method to message_filter.Subscriber (`#683 <https://github.com/ros/ros_comm/pull/683>`_)
diff --git a/utilities/message_filters/package.xml b/utilities/message_filters/package.xml
index 7484a43..714587e 100644
--- a/utilities/message_filters/package.xml
+++ b/utilities/message_filters/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>message_filters</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     A set of message filters which take in messages and may output those messages at a later time, based on the conditions that filter needs met.
   </description>
diff --git a/utilities/roslz4/CHANGELOG.rst b/utilities/roslz4/CHANGELOG.rst
index 9fb3eaa..b62783d 100644
--- a/utilities/roslz4/CHANGELOG.rst
+++ b/utilities/roslz4/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package roslz4
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/utilities/roslz4/package.xml b/utilities/roslz4/package.xml
index d9b6ab0..42abf0b 100644
--- a/utilities/roslz4/package.xml
+++ b/utilities/roslz4/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>roslz4</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     A Python and C++ implementation of the LZ4 streaming format.  Large data
     streams are split into blocks which are compressed using the very fast LZ4
diff --git a/utilities/roswtf/CHANGELOG.rst b/utilities/roswtf/CHANGELOG.rst
index f0d69de..9f80ad8 100644
--- a/utilities/roswtf/CHANGELOG.rst
+++ b/utilities/roswtf/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package roswtf
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/utilities/roswtf/package.xml b/utilities/roswtf/package.xml
index 1fbc38a..5539b27 100644
--- a/utilities/roswtf/package.xml
+++ b/utilities/roswtf/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>roswtf</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
      roswtf is a tool for diagnosing issues with a running ROS system. Think of it as a FAQ implemented in code.
   </description>
diff --git a/utilities/xmlrpcpp/CHANGELOG.rst b/utilities/xmlrpcpp/CHANGELOG.rst
index 348f84a..cebb5bf 100644
--- a/utilities/xmlrpcpp/CHANGELOG.rst
+++ b/utilities/xmlrpcpp/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package xmlrpcpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.11.16 (2015-11-09)
+--------------------
+
 1.11.15 (2015-10-13)
 --------------------
 
diff --git a/utilities/xmlrpcpp/package.xml b/utilities/xmlrpcpp/package.xml
index 7478425..1336d78 100644
--- a/utilities/xmlrpcpp/package.xml
+++ b/utilities/xmlrpcpp/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>xmlrpcpp</name>
-  <version>1.11.15</version>
+  <version>1.11.16</version>
   <description>
     XmlRpc++ is a C++ implementation of the XML-RPC protocol. This version is
     heavily modified from the package available on SourceForge in order to

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



More information about the debian-science-commits mailing list