[DRE-commits] [ruby-docker-api] 01/02: Merge tag 'upstream/1.10.4'

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository ruby-docker-api.

commit 5c3cff71b561759b832c752ce3b197e19501153e
Merge: 91995b1 a13550a
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Mar 23 22:38:35 2014 -0300

    Merge tag 'upstream/1.10.4'
    
    Upstream version 1.10.4

 README.md                                          |  18 +-
 Rakefile                                           |   7 +
 checksums.yaml.gz                                  | Bin 268 -> 269 bytes
 docker-api.gemspec                                 |   1 +
 lib/docker.rb                                      |   1 +
 lib/docker/error.rb                                |   3 +
 lib/docker/image.rb                                |  41 +-
 lib/docker/rake_task.rb                            |  25 +-
 lib/docker/version.rb                              |   2 +-
 metadata.yml                                       |  28 +-
 spec/docker/image_spec.rb                          |  39 +-
 spec/support/vcr.rb                                |   3 +-
 .../sets_the_id.yml                                |  38 --
 .../sets_the_id_and_sends_Docker_creds.yml         | 697 +++++++++++++++++++++
 .../when_the_URI_is_invalid/raises_an_error.yml    | 144 +++++
 .../when_the_URI_is_valid/returns_an_Image.yml     |  81 +++
 .../when_the_file_does_exist/creates_the_Image.yml |  34 +
 .../creates_a_new_image.yml                        |  78 ++-
 .../leave_no_intermediate_containers.yml           | 120 ++--
 .../creates_a_new_Image_that_has_that_file.yml     |  46 +-
 .../raises_an_error.yml                            |   8 +-
 .../creates_a_new_Image_that_has_each_file.yml     |  88 +--
 22 files changed, 1236 insertions(+), 266 deletions(-)

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