[DRE-commits] [rhc] 02/08: Merge tag 'upstream/1.36.4' into master2

[Chow Loong Jin]

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

hyperair pushed a commit to branch master
in repository rhc.

commit 14887948627eac2282ca1b802031a73bd077715e
Merge: dde6b25 85bd167
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Nov 9 01:17:55 2015 +0800

    Merge tag 'upstream/1.36.4' into master2
    
    Upstream version 1.36.4

 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