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

[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 13c1f98b4bb12d3a4d54b92bae8610a2dec900ce
Merge: 3988635 f7e9cf1
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Jan 14 11:26:17 2015 +0100

    Merge tag 'upstream/0.6.11'
    
    Upstream version 0.6.11

 CHANGELOG.rst                                | 14 +++++
 bin/catkin_make                              | 35 ++++++++---
 bin/catkin_make_isolated                     |  4 +-
 cmake/catkin_workspace.cmake                 |  2 +-
 cmake/env-hooks/05.catkin_make.bash          |  3 +
 cmake/env-hooks/05.catkin_make_isolated.bash |  3 +
 cmake/templates/setup.zsh.in                 |  6 +-
 cmake/test/download_checkmd5.py              | 54 ++++++++++-------
 cmake/test/run_tests.py                      | 52 ++--------------
 package.xml                                  |  2 +-
 python/catkin/builder.py                     | 90 +++++++++++++++++++++-------
 python/catkin/test_results.py                | 62 ++++++++++++++++++-
 test/unit_tests/test_download_md5.py         |  2 +-
 13 files changed, 219 insertions(+), 110 deletions(-)

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