[DRE-commits] [chef-zero] 01/04: Merge tag 'upstream/4.6.2'

[Stefano Rivera]

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

stefanor pushed a commit to branch master
in repository chef-zero.

commit 97ca666b551593758f4a9f716613eefa5153b06b
Merge: 4f1e3fc a687e91
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sat May 7 12:58:19 2016 +0200

    Merge tag 'upstream/4.6.2'
    
    Upstream version 4.6.2

 Gemfile                                            |   6 +-
 Rakefile                                           |  52 ++--
 bin/chef-zero                                      |   3 +-
 chef-zero.gemspec                                  |   3 +-
 lib/chef_zero/chef_data/cookbook_data.rb           |   5 +
 lib/chef_zero/chef_data/data_normalizer.rb         |   6 +-
 lib/chef_zero/data_store/data_error.rb             |   7 +-
 .../endpoints/actor_default_key_endpoint.rb        |  77 +++++
 lib/chef_zero/endpoints/actor_endpoint.rb          | 128 ++++++--
 lib/chef_zero/endpoints/actor_key_endpoint.rb      |  62 ++++
 lib/chef_zero/endpoints/actor_keys_endpoint.rb     | 129 ++++++++
 lib/chef_zero/endpoints/actors_endpoint.rb         |  50 +++-
 .../organization_user_default_key_endpoint.rb      |  16 +
 .../endpoints/organization_user_key_endpoint.rb    |  17 ++
 .../endpoints/organization_user_keys_endpoint.rb   |  17 ++
 lib/chef_zero/endpoints/principal_endpoint.rb      |  13 +-
 lib/chef_zero/endpoints/rest_object_endpoint.rb    |  24 +-
 .../endpoints/server_api_version_endpoint.rb       |   2 +-
 lib/chef_zero/rest_base.rb                         | 107 +++++--
 lib/chef_zero/rest_error_response.rb               |   6 +-
 lib/chef_zero/rest_request.rb                      |  13 +-
 lib/chef_zero/rest_router.rb                       |  61 ++--
 lib/chef_zero/rspec.rb                             |   2 +-
 lib/chef_zero/server.rb                            |  69 +++--
 lib/chef_zero/version.rb                           |   2 +-
 metadata.yml                                       | 332 ---------------------
 spec/run_oc_pedant.rb                              | 109 +++++--
 27 files changed, 808 insertions(+), 510 deletions(-)

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