[DRE-commits] [ruby-cabin] 02/05: Merge branch 'upstream'

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository ruby-cabin.

commit d8834ce91b5be8480133c64497d9c06847a81834
Merge: 100fadd 50bcbf7
Author: Tim Potter <tpot at hp.com>
Date:   Wed Jul 1 14:06:11 2015 +1000

    Merge branch 'upstream'

 examples/pipe-spoon.rb             |  25 --------
 lib/cabin/channel.rb               |   7 ++-
 lib/cabin/mixins/logger.rb         |   2 +-
 lib/cabin/mixins/pipe.rb           |   3 +-
 lib/cabin/mixins/terminal.rb       |  11 ++++
 lib/cabin/outputs/io.rb            |   5 +-
 lib/cabin/outputs/stdlib-logger.rb |   8 ++-
 metadata.yml                       | 126 ++++++++++++++++---------------------
 test/test_logging.rb               |  19 ++++++
 test/test_pipe.rb                  |  84 +++++++++++++++++++++++++
 10 files changed, 186 insertions(+), 104 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-cabin.git