[catkin] 01/02: Merge tag 'upstream/0.6.15'

[Jochen Sprickerhof]

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

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

commit ab7eaeae2ef6f1512cde634307e3218240b5d9e8
Merge: b256f25 55687b9
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Sep 21 10:51:56 2015 +0200

    Merge tag 'upstream/0.6.15'
    
    Upstream version 0.6.15

 CHANGELOG.rst                                   |  9 +++-
 bin/catkin_make                                 | 58 +++++++++++++++++----
 bin/catkin_make_isolated                        | 21 +++++---
 cmake/interrogate_setup_dot_py.py               | 15 +++---
 cmake/test/nosetests.cmake                      |  3 +-
 cmake/test/remove_test_results.py               | 32 ++++++++++++
 cmake/test/tests.cmake                          | 11 ++--
 doc/generate_cmake_rst.py                       |  2 +-
 doc/howto/format1/python_nose_configuration.rst |  8 ---
 doc/howto/format2/python_nose_configuration.rst |  8 ---
 package.xml                                     |  4 +-
 python/catkin/builder.py                        | 68 ++++++++++++++++++++++---
 python/catkin/find_in_workspaces.py             |  4 +-
 test/unit_tests/test_find_in_workspace.py       |  1 -
 test/unit_tests/test_interrogate_setup.py       | 18 +++----
 15 files changed, 196 insertions(+), 66 deletions(-)

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