docker-api 1.29.0 → 1.29.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/docker/container.rb +1 -1
  3. data/lib/docker/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 29ba56360b810e2e0ba6b89d141050924fe411af
4
- data.tar.gz: 5e13ee3c1047314c24d22db68061ba92ff9e6244
3
+ metadata.gz: 17dbc583aa1c52dfc1bbd768b5a738890ec83cf2
4
+ data.tar.gz: 6e1297299f08aa3194eacefa35d3a34856e291af
5
5
  SHA512:
6
- metadata.gz: 8f2b8f6a76c9ad7e608b4b8405e5e8456849b81b4570b079a5c58f11940b4f53c9f20c5a7eaeca7b11105945f84811921d5e1aa1aaeaf78b9878dd2716970ca9
7
- data.tar.gz: 3b5e1c48e6c7a7afdab6679abca8e8ca99393b7b8e95d4fb0a4eb131f54c3368d5b75253f8d7fd469eff6bbc0b7c6089deab9ebfc8ad7c53738ac96466d25ca6
6
+ metadata.gz: 7c50e5e36e05b5daf6651d30ba5b06b16ac2e53ad852fd021dd281d6007d9092cc8841e7bf4095fe17ee2fc4be095f9cdc509206087a18e9c022b16c43762762
7
+ data.tar.gz: d878f991e56ac69e68e718d66d43dfdf9780568aa7a45ecc3e528b78f987b3cb0c8da16464a11e6d0fb2598a732b9ca01fc5e94e32a985290aa022e04c0d38d7
data/lib/docker/container.rb CHANGED
@@ -11,7 +11,7 @@ class Docker::Container
11
11
  }
12
12
 
13
13
  info.merge!(self.json)
14
- other && info.merge!(other.info)
14
+ other && info.merge!(other.info) { |key, info_value, other_value| info_value }
15
15
  self
16
16
  end
17
17
 
data/lib/docker/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Docker
2
2
  # The version of the docker-api gem.
3
- VERSION = '1.29.0'
3
+ VERSION = '1.29.1'
4
4
 
5
5
  # The version of the compatible Docker remote API.
6
6
  API_VERSION = '1.16'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.29.0
4
+ version: 1.29.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Swipely, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-23 00:00:00.000000000 Z
11
+ date: 2016-07-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: excon