[DRE-commits] [chef-zero] 01/05: Merge tag 'upstream/4.2.2'

[Antonio Terceiro]

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

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

commit 7285bbfeeeab045580eb05e26ad2fde214ab040c
Merge: 772d1df 5c48ae1
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 15:55:32 2015 -0300

    Merge tag 'upstream/4.2.2'
    
    Upstream version 4.2.2
    
    # gpg: Signature made Sáb 13 Jun 2015 15:55:28 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 README.md                                          |   2 +-
 Rakefile                                           |   3 +
 bin/chef-zero                                      |   9 +
 lib/chef_zero/chef_data/cookbook_data.rb           |   2 +-
 lib/chef_zero/chef_data/default_creator.rb         |  10 +-
 lib/chef_zero/data_store/default_facade.rb         |   2 +-
 lib/chef_zero/data_store/memory_store_v2.rb        |   2 +-
 lib/chef_zero/data_store/v1_to_v2_adapter.rb       |   8 +-
 lib/chef_zero/endpoints/acl_endpoint.rb            |   8 +-
 lib/chef_zero/endpoints/acls_endpoint.rb           |   4 +-
 lib/chef_zero/endpoints/actor_endpoint.rb          |  12 +-
 lib/chef_zero/endpoints/actors_endpoint.rb         |  20 +-
 .../endpoints/authenticate_user_endpoint.rb        |   6 +-
 lib/chef_zero/endpoints/container_endpoint.rb      |   6 +-
 lib/chef_zero/endpoints/containers_endpoint.rb     |   2 +-
 lib/chef_zero/endpoints/cookbook_endpoint.rb       |   2 +-
 .../endpoints/cookbook_version_endpoint.rb         |  14 +-
 lib/chef_zero/endpoints/cookbooks_base.rb          |   2 +-
 lib/chef_zero/endpoints/data_bag_endpoint.rb       |   6 +-
 lib/chef_zero/endpoints/data_bag_item_endpoint.rb  |   6 +-
 lib/chef_zero/endpoints/data_bags_endpoint.rb      |   4 +-
 .../endpoints/environment_cookbook_endpoint.rb     |   4 +-
 .../environment_cookbook_versions_endpoint.rb      |  10 +-
 .../endpoints/environment_cookbooks_endpoint.rb    |   4 +-
 lib/chef_zero/endpoints/environment_endpoint.rb    |   6 +-
 .../endpoints/environment_nodes_endpoint.rb        |   4 +-
 .../endpoints/environment_recipes_endpoint.rb      |   6 +-
 .../endpoints/environment_role_endpoint.rb         |   4 +-
 lib/chef_zero/endpoints/group_endpoint.rb          |   6 +-
 lib/chef_zero/endpoints/groups_endpoint.rb         |   2 +-
 lib/chef_zero/endpoints/license_endpoint.rb        |   2 +-
 lib/chef_zero/endpoints/node_endpoint.rb           |   6 +-
 lib/chef_zero/endpoints/not_found_endpoint.rb      |   4 +-
 .../organization_association_request_endpoint.rb   |   4 +-
 .../organization_association_requests_endpoint.rb  |   4 +-
 .../organization_authenticate_user_endpoint.rb     |   6 +-
 lib/chef_zero/endpoints/organization_endpoint.rb   |  12 +-
 .../endpoints/organization_user_endpoint.rb        |  10 +-
 .../endpoints/organization_users_endpoint.rb       |   2 +-
 .../organization_validator_key_endpoint.rb         |   6 +-
 lib/chef_zero/endpoints/organizations_endpoint.rb  |  10 +-
 lib/chef_zero/endpoints/policies_endpoint.rb       | 154 +++++++
 lib/chef_zero/endpoints/principal_endpoint.rb      |   4 +-
 lib/chef_zero/endpoints/rest_list_endpoint.rb      |   4 +-
 lib/chef_zero/endpoints/rest_object_endpoint.rb    |  10 +-
 lib/chef_zero/endpoints/role_endpoint.rb           |   6 +-
 .../endpoints/role_environments_endpoint.rb        |   4 +-
 lib/chef_zero/endpoints/sandbox_endpoint.rb        |   4 +-
 lib/chef_zero/endpoints/sandboxes_endpoint.rb      |   8 +-
 lib/chef_zero/endpoints/search_endpoint.rb         |   6 +-
 .../endpoints/system_recovery_endpoint.rb          |   6 +-
 .../endpoints/user_association_request_endpoint.rb |   8 +-
 .../user_association_requests_count_endpoint.rb    |   2 +-
 .../user_association_requests_endpoint.rb          |   2 +-
 .../endpoints/user_organizations_endpoint.rb       |   4 +-
 lib/chef_zero/endpoints/version_endpoint.rb        |  12 +
 lib/chef_zero/rest_base.rb                         |   9 +-
 lib/chef_zero/rspec.rb                             | 450 +++++++++++----------
 lib/chef_zero/server.rb                            |  56 ++-
 lib/chef_zero/socketless_server_map.rb             |  92 +++++
 lib/chef_zero/version.rb                           |   2 +-
 metadata.yml                                       |  22 +-
 spec/run_oc_pedant.rb                              |   3 +
 spec/run_pedant.rb                                 |   5 +-
 spec/server_spec.rb                                |   9 +
 spec/socketless_server_map_spec.rb                 |  76 ++++
 spec/support/pedant.rb                             |   4 +
 67 files changed, 817 insertions(+), 387 deletions(-)

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