[DRE-commits] [gitlab-shell] 02/04: Merge tag 'upstream/2.6.9'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab-shell.

commit 994e689629aefc7440d4246f404d688c6c6225d1
Merge: 502929a 33299c6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Dec 28 23:55:13 2015 +0530

    Merge tag 'upstream/2.6.9'
    
    Upstream version 2.6.9
    
    # gpg: Signature made Monday 28 December 2015 11:55:07 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 .gitlab-ci.yml             |  7 +++---
 CHANGELOG                  | 23 ++++++++++++++---
 README.md                  |  8 +++---
 VERSION                    |  2 +-
 bin/gitlab-shell           |  2 +-
 config.yml.example         | 10 +++++---
 lib/gitlab_config.rb       |  2 +-
 lib/gitlab_net.rb          |  7 +++++-
 lib/gitlab_projects.rb     | 41 +++++++++++++++++++++++++-----
 lib/gitlab_shell.rb        | 41 ++++++++++++++++++++----------
 lib/httpunix.rb            | 54 +++++++++++++++++++++++++++++++++++++++
 spec/gitlab_config_spec.rb |  6 +++++
 spec/gitlab_shell_spec.rb  | 63 +++++++++++++++++++++++++++++-----------------
 spec/httpunix_spec.rb      | 55 ++++++++++++++++++++++++++++++++++++++++
 14 files changed, 260 insertions(+), 61 deletions(-)

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