[DRE-commits] [gitlab-shell] 04/09: Merge tag 'upstream/3.0.0'

[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 3d453415dc40bbd222031caf8f521f7d563f6e82
Merge: c75b798 e9e0a21
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jun 3 15:53:19 2016 +0530

    Merge tag 'upstream/3.0.0'
    
    Upstream version 3.0.0
    
    # gpg: Signature made Friday 03 June 2016 03:53:12 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                                     |   22 +
 .rubocop.yml                                       |    1 +
 CHANGELOG                                          |   29 +
 Gemfile.lock                                       |    3 +
 Makefile                                           |   12 +
 README.md                                          |   24 +-
 VERSION                                            |    2 +-
 bin/authorized_keys                                |   25 +
 bin/check                                          |    5 +-
 bin/gitlab-projects                                |    2 -
 config.yml.example                                 |    5 +-
 lib/gitlab_authorized_keys.rb                      |    0
 lib/gitlab_config.rb                               |   23 +-
 lib/gitlab_keys.rb                                 |   26 +-
 lib/gitlab_net.rb                                  |   52 +-
 lib/gitlab_post_receive.rb                         |   15 +-
 lib/gitlab_projects.rb                             |  108 +-
 lib/gitlab_shell.rb                                |    5 +-
 lib/vendor/redis/lib/redis.rb                      | 2773 ++++++++++++++++++++
 lib/vendor/redis/lib/redis/client.rb               |  590 +++++
 lib/vendor/redis/lib/redis/connection.rb           |    9 +
 .../redis/lib/redis/connection/command_helper.rb   |   44 +
 lib/vendor/redis/lib/redis/connection/hiredis.rb   |   66 +
 lib/vendor/redis/lib/redis/connection/registry.rb  |   12 +
 lib/vendor/redis/lib/redis/connection/ruby.rb      |  376 +++
 lib/vendor/redis/lib/redis/connection/synchrony.rb |  133 +
 lib/vendor/redis/lib/redis/distributed.rb          |  873 ++++++
 lib/vendor/redis/lib/redis/errors.rb               |   40 +
 lib/vendor/redis/lib/redis/hash_ring.rb            |  132 +
 lib/vendor/redis/lib/redis/pipeline.rb             |  141 +
 lib/vendor/redis/lib/redis/subscribe.rb            |   91 +
 lib/vendor/redis/lib/redis/version.rb              |    3 +
 spec/gitlab_config_spec.rb                         |   38 +-
 spec/gitlab_net_spec.rb                            |   92 +-
 spec/gitlab_post_receive_spec.rb                   |   22 +-
 spec/gitlab_projects_spec.rb                       |   80 -
 spec/gitlab_shell_spec.rb                          |   11 +-
 spec/httpunix_spec.rb                              |   17 +
 spec/vcr_cassettes/ssh-key-not-found.yml           |   50 +
 spec/vcr_cassettes/ssh-key-not-implemented.yml     |   50 +
 spec/vcr_cassettes/ssh-key-ok.yml                  |   40 +
 41 files changed, 5795 insertions(+), 247 deletions(-)

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