projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2449-keep-write-blocks
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 39718bda445f29624ccd9d118c2a5b88e299656d..e6fcbde95a5909f32188f2eb89492d7e92d0fe35 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,12
+35,12
@@
GEM
addressable (2.3.5)
andand (1.3.3)
arel (3.0.2)
addressable (2.3.5)
andand (1.3.3)
arel (3.0.2)
- arvados (0.1.20140
328152103
)
+ arvados (0.1.20140
411162938
)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
- arvados-cli (0.1.20140
328152103
)
+ arvados-cli (0.1.20140
411162938
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
@@
-67,7
+67,6
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
coffee-script-source
execjs
coffee-script-source (1.6.3)
- curb (0.8.5)
daemon_controller (1.1.7)
erubis (2.7.0)
execjs (2.0.2)
daemon_controller (1.1.7)
erubis (2.7.0)
execjs (2.0.2)