projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ddb8e3 611f3d6)
closes #7399
authorradhika <radhika@curoverse.com>
Wed, 2 Mar 2016 18:22:06 +0000 (13:22 -0500)
committerradhika <radhika@curoverse.com>
Wed, 2 Mar 2016 18:22:06 +0000 (13:22 -0500)
Merge branch '7399-log-throttling'

1  2 
services/api/lib/crunch_dispatch.rb patch | diff1 | diff2 | blob | history
services/api/test/unit/crunch_dispatch_test.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/lib/crunch_dispatch.rb
Simple merge