[DRE-commits] [rhc] 01/04: Merge tag 'upstream/1.36.4'

[Chow Loong Jin]

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

hyperair pushed a commit to annotated tag debian/1.37.1-1
in repository rhc.

commit 69639efbe660fae4b8eb28ddbc0b1ed00c3eb56e
Merge: 30dd9d4 85bd167
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Jul 24 02:09:16 2015 +0800

    Merge tag 'upstream/1.36.4'
    
    Upstream version 1.36.4
    
    # gpg: Signature made Fri 24 Jul 2015 02:09:14 AM SGT using RSA key ID 588752A1
    # gpg: Good signature from "Chow Loong Jin <hyperair at debian.org>"
    # gpg:                 aka "Chow Loong Jin <hyperair at ubuntu.com>"
    # gpg:                 aka "Chow Loong Jin <chow0082 at e.ntu.edu.sg>"
    # gpg:                 aka "Chow Loong Jin <hyperair at gmail.com>"
    # gpg:                 aka "Chow Loong Jin <chow0082 at ntu.edu.sg>"
    # gpg:                 aka "Chow Loong Jin <loongjin at solution-space.com>"
    # gpg:                 aka "Chow Loong Jin <lchow at redhat.com>"

 lib/rhc/commands/app.rb          | 16 +++++++++--
 lib/rhc/commands/port_forward.rb |  3 +-
 lib/rhc/rest/client.rb           |  4 +--
 metadata.yml                     |  8 +++---
 spec/rhc/commands/app_spec.rb    | 59 +++++++++++++++++++++++++++++-----------
 spec/rhc/helpers_spec.rb         |  2 +-
 spec/rhc/rest_client_spec.rb     |  2 +-
 spec/rhc/rest_spec.rb            |  4 +--
 spec/spec_helper.rb              |  3 +-
 9 files changed, 70 insertions(+), 31 deletions(-)

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