marathon-api 1.2.3 → 1.2.4
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.
- checksums.yaml +4 -4
- data/lib/marathon/connection.rb +2 -2
- data/lib/marathon/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9835344dde411ccfcafb295094621b8b590e3eff
|
|
4
|
+
data.tar.gz: 563a4c105700eb6c9cb7b5d860ef7d0348e3452a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ad19835b6dc49083c1887d97acc9efef31d08053ab76b04cb8435768c2bc8e60632df9bc7b1f978a9f84f2a5fc0b709e3865c8e2692203beb1863619badcd31d
|
|
7
|
+
data.tar.gz: 481001f8dbca716bdab68114e6d43e99238dbd2b88d2db54ce135e2b1ecb32a565cb51eafdf60393ea03d283670ca8727d270a376845daa30503c5c5e347e7d2
|
data/lib/marathon/connection.rb
CHANGED
|
@@ -64,7 +64,7 @@ private
|
|
|
64
64
|
:method => http_method,
|
|
65
65
|
:url => "#{@url}#{path}",
|
|
66
66
|
:query => query
|
|
67
|
-
}.merge(opts).reject { |_, v| v.nil? }
|
|
67
|
+
}.merge(@options).merge(opts).reject { |_, v| v.nil? }
|
|
68
68
|
end
|
|
69
69
|
|
|
70
70
|
# Create full URL with query parameters.
|
|
@@ -104,4 +104,4 @@ private
|
|
|
104
104
|
end
|
|
105
105
|
end
|
|
106
106
|
|
|
107
|
-
end
|
|
107
|
+
end
|
data/lib/marathon/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: marathon-api
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Felix Bechstein
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-04-
|
|
11
|
+
date: 2015-04-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: json
|