Merge pull request #3090 from ojab/master

`bundle update rbtrace` for mri-2.2.0 compatibility
This commit is contained in:
Robin Ward 2015-01-20 15:21:56 -05:00
commit 2a6657bf53

View File

@ -225,7 +225,7 @@ GEM
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mock_redis (0.13.2) mock_redis (0.13.2)
moneta (0.8.0) moneta (0.8.0)
msgpack (0.5.8) msgpack (0.5.10)
multi_json (1.10.1) multi_json (1.10.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
@ -328,7 +328,7 @@ GEM
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rbtrace (0.4.5) rbtrace (0.4.6)
ffi (>= 1.0.6) ffi (>= 1.0.6)
msgpack (>= 0.4.3) msgpack (>= 0.4.3)
trollop (>= 1.16.2) trollop (>= 1.16.2)
@ -436,7 +436,7 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
trollop (2.0) trollop (2.1.1)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.6.0) uglifier (2.6.0)