[2/2] karaf git commit: Merge branch 'ShellTableTest-fix' of https://github.com/mhautman/karaf

[jbonofre]

Merge branch 'ShellTableTest-fix' of https://github.com/mhautman/karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/36d667b9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/36d667b9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/36d667b9

Branch: refs/heads/master
Commit: 36d667b9e195d522225a9fbce26d19eafc8df48b
Parents: 6676cf4 3478862
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Thu Jun 4 12:59:44 2015 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Thu Jun 4 12:59:44 2015 +0200

----------------------------------------------------------------------
 .../apache/karaf/profile/assembly/CustomSimpleDownloadTask.java   | 3 +++
 .../src/test/java/org/apache/karaf/profile/impl/ProfilesTest.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------