projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10315: Merge branch 'master' into 10315-new-arv-put-performance
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 77e876e926f0991193960aa646cef805b133d556..6f7875163b63fa6af8462f2999e42bad4902f37d 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-42,12
+42,12
@@
GEM
i18n (~> 0)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 2)
i18n (~> 0)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 2)
- arvados-cli (0.1.2016
0503204200
)
+ arvados-cli (0.1.2016
1017193526
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
curb (~> 0.8)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
curb (~> 0.8)
- google-api-client (~> 0.6, >= 0.6.3, < 0.9)
+ google-api-client (~> 0.6, >= 0.6.3, < 0.
8.
9)
json (~> 1.7, >= 1.7.7)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
json (~> 1.7, >= 1.7.7)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
@@
-112,6
+112,11
@@
GEM
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.3)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.3)
+ lograge (0.3.6)
+ actionpack (>= 3)
+ activesupport (>= 3)
+ railties (>= 3)
+ logstash-event (1.2.02)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@
-231,12
+236,14
@@
DEPENDENCIES
acts_as_api
andand
arvados (>= 0.1.20150615153458)
acts_as_api
andand
arvados (>= 0.1.20150615153458)
- arvados-cli (>= 0.1.201
512071501
26)
+ arvados-cli (>= 0.1.201
610171935
26)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
faye-websocket
jquery-rails
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
faye-websocket
jquery-rails
+ lograge
+ logstash-event
mocha
multi_json
oj
mocha
multi_json
oj