diaspora/Gemfile.lock
danielgrippi 6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
2011-11-07 12:50:02 -08:00

551 lines
13 KiB
Text

GIT
remote: git://github.com/Empact/roxml.git
revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
ref: 7ea9a9ffd2338aaef5b0
specs:
roxml (3.1.6)
activesupport (>= 2.3.0)
nokogiri (>= 1.3.3)
GIT
remote: git://github.com/MikeSofaer/sod.git
revision: 08e990601bfa6ffd3224a2e4c792df9eae712693
specs:
sod (0.0.1)
net-scp
GIT
remote: git://github.com/MikeSofaer/vanna.git
revision: 334eec220dbfddcc6bd3108e6e6c77fec8484dc4
specs:
vanna (0.1.1)
json
rails (>= 3.0.0)
GIT
remote: git://github.com/diaspora/acts-as-taggable-on.git
revision: c3592fe1a906f6ff1cd12766c5cf1152c51eec40
specs:
acts-as-taggable-on (2.0.6)
rails (>= 3.0)
GIT
remote: git://github.com/diaspora/diaspora-client.git
revision: a1b6c480fa3caa8ce24912dda471579de842aa51
specs:
diaspora-client (0.1.1)
activerecord
faraday
jwt (>= 0.1.3)
oauth2 (= 0.4.1)
sinatra
GIT
remote: git://github.com/iain/http_accept_language.git
revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d
ref: 0b78aa7849fc90cf9e12
specs:
http_accept_language (1.0.1)
GEM
remote: http://rubygems.org/
specs:
POpen4 (0.1.4)
Platform (>= 0.4.0)
open4
Platform (0.4.0)
SystemTimer (1.2.1)
abstract (1.0.0)
actionmailer (3.0.10)
actionpack (= 3.0.10)
mail (~> 2.2.19)
actionpack (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.10)
activesupport (= 3.0.10)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activerecord-import (0.2.8)
activerecord (~> 3.0pre)
activerecord (~> 3.0pre)
activeresource (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activesupport (3.0.10)
addressable (2.2.4)
archive-tar-minitar (0.5.2)
arel (2.0.10)
aws (2.3.32)
activesupport
http_connection
uuidtools
xml-simple
bcrypt-ruby (2.1.4)
builder (2.1.2)
bunny (0.7.8)
capistrano (2.5.19)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.0.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
capybara (0.3.9)
culerity (>= 0.2.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3)
carrierwave (0.5.3)
activesupport (~> 3.0)
cgi_multipart_eof_fix (2.5.0)
chef (0.9.12)
bunny (>= 0.6.0)
erubis
extlib
highline
json (>= 1.4.4, <= 1.4.6)
mixlib-authentication (>= 1.1.0)
mixlib-cli (>= 1.1.0)
mixlib-config (>= 1.1.2)
mixlib-log (>= 1.2.0)
moneta
ohai (>= 0.5.7)
rest-client (>= 1.0.4, < 1.7.0)
uuidtools
childprocess (0.2.2)
ffi (~> 1.0.6)
client_side_validations (3.1.0)
closure-compiler (1.1.4)
cloudfiles (1.4.10)
mime-types (>= 1.16)
columnize (0.3.4)
crack (0.3.1)
cucumber (1.1.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.5.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-api-steps (0.6)
cucumber (>= 0.8.3)
jsonpath (>= 0.1.2)
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.15)
daemons (1.1.4)
database_cleaner (0.6.0)
devise (1.3.4)
bcrypt-ruby (~> 2.1.2)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
devise_invitable (0.5.0)
devise (~> 1.3.1)
rails (>= 3.0.0, <= 3.2)
diff-lcs (1.1.3)
em-synchrony (0.2.0)
eventmachine (>= 0.12.9)
em-websocket (0.3.5)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.6.6)
abstract (>= 1.0.0)
eventmachine (0.12.10)
excon (0.2.4)
extlib (0.9.15)
factory_girl (2.1.2)
activesupport
factory_girl_rails (1.2.0)
factory_girl (~> 2.1.0)
railties (>= 3.0.0)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
faraday-stack (0.1.3)
faraday (~> 0.6)
faraday_middleware (0.6.5)
faraday (~> 0.6.0)
fastercsv (1.5.4)
fastthread (1.0.7)
ffi (1.0.9)
fixture_builder (0.3.0)
activerecord (>= 2)
activesupport (>= 2)
fog (0.3.25)
builder
excon (>= 0.2.4)
formatador (>= 0.0.16)
json
mime-types
net-ssh (~> 2.0.23)
nokogiri (~> 1.4.3.1)
ruby-hmac
foreigner (0.9.1)
foreman (0.24.0)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)
formatador (0.2.1)
fuubar (0.0.6)
rspec (~> 2.0)
rspec-instafail (~> 0.1.8)
ruby-progressbar (~> 0.0.10)
gem_plugin (0.2.3)
gherkin (2.5.2)
json (>= 1.4.6)
haml (3.1.2)
hashie (1.0.0)
highline (1.6.2)
hoptoad_notifier (2.4.11)
activesupport
builder
http_connection (1.4.1)
i18n (0.5.0)
i18n-inflector (2.6.3)
i18n (>= 0.4.1)
i18n-inflector-rails (1.0.6)
actionpack (~> 3.0)
i18n-inflector (~> 2.6)
railties (~> 3.0)
jammit (0.5.4)
closure-compiler (>= 0.1.0)
yui-compressor (>= 0.9.1)
jasmine (1.1.0.rc3)
jasmine-core (>= 1.1.0.rc2)
rack (>= 1.1)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.2.0.rc1)
json (1.4.6)
json_pure (1.6.1)
jsonpath (0.4.2)
multi_json
jwt (0.1.3)
json (>= 1.2.4)
linecache (0.43)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
messagebus_ruby_api (0.4.8)
mime-types (1.16)
mini_magick (3.2)
subexec (~> 0.0.4)
mixlib-authentication (1.1.4)
mixlib-log
mixlib-cli (1.2.2)
mixlib-config (1.1.2)
mixlib-log (1.3.0)
mobile-fu (0.2.1)
rack-mobile-detect
rails
mock_redis (0.2.0)
moneta (0.6.0)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
daemons (>= 1.0.3)
fastthread (>= 1.0.1)
gem_plugin (>= 0.2.3)
multi_json (1.0.3)
multi_xml (0.2.2)
multipart-post (1.1.3)
mysql2 (0.2.13)
net-ldap (0.2.2)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.0.24)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
newrelic_rpm (3.2.0)
nokogiri (1.4.3.1)
oa-basic (0.2.6)
oa-core (= 0.2.6)
rest-client (~> 1.6.0)
oa-core (0.2.6)
oa-enterprise (0.2.6)
addressable (= 2.2.4)
net-ldap (~> 0.2.2)
nokogiri (~> 1.4.2)
oa-core (= 0.2.6)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
oa-more (0.2.6)
multi_json (~> 1.0.0)
oa-core (= 0.2.6)
rest-client (~> 1.6.0)
oa-oauth (0.2.6)
faraday (~> 0.6.1)
multi_json (~> 1.0.0)
multi_xml (~> 0.2.2)
oa-core (= 0.2.6)
oauth (~> 0.4.0)
oauth2 (~> 0.4.1)
oa-openid (0.2.6)
oa-core (= 0.2.6)
rack-openid (~> 1.3.1)
ruby-openid-apps-discovery (~> 1.2.0)
oauth (0.4.5)
oauth2 (0.4.1)
faraday (~> 0.6.1)
multi_json (>= 0.0.5)
oauth2-provider (0.0.16)
activesupport (~> 3.0.1)
addressable (~> 2.2)
ohai (0.5.8)
extlib
json (>= 1.4.4, <= 1.4.6)
mixlib-cli
mixlib-config
mixlib-log
systemu
omniauth (0.2.6)
oa-basic (= 0.2.6)
oa-core (= 0.2.6)
oa-enterprise (= 0.2.6)
oa-more (= 0.2.6)
oa-oauth (= 0.2.6)
oa-openid (= 0.2.6)
open4 (1.2.0)
orm_adapter (0.0.5)
parallel (0.5.9)
parallel_tests (0.6.7)
parallel
polyglot (0.3.2)
pyu-ruby-sasl (0.0.3.3)
rack (1.2.4)
rack-mobile-detect (0.3.0)
rack
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.10)
actionmailer (= 3.0.10)
actionpack (= 3.0.10)
activerecord (= 3.0.10)
activeresource (= 3.0.10)
activesupport (= 3.0.10)
bundler (~> 1.0)
railties (= 3.0.10)
rails-i18n (0.1.10)
i18n (~> 0.5)
railties (3.0.10)
actionpack (= 3.0.10)
activesupport (= 3.0.10)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rash (0.3.0)
hashie (~> 1.0.0)
rdoc (3.10)
json (~> 1.4)
redcarpet (2.0.0b5)
redis (2.2.2)
redis-namespace (0.8.0)
redis (< 3.0.0)
resque (1.10.0)
json (~> 1.4.6)
redis-namespace (~> 0.8.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
resque-ensure-connected (0.1.0)
activerecord (>= 2.3.5)
resque (~> 1.10.0)
resque-timeout (1.0.0)
resque (~> 1.0)
rest-client (1.6.1)
mime-types (>= 1.16)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.0)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-instafail (0.1.8)
rspec-mocks (2.6.0)
rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby-hmac (0.4.0)
ruby-oembed (0.8.3)
ruby-openid (2.1.8)
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
ruby-progressbar (0.0.10)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubyntlm (0.1.1)
rubyzip (0.9.4)
sass (3.1.7)
selenium-webdriver (2.7.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
settingslogic (2.0.6)
simple_oauth (0.1.5)
sinatra (1.2.7)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
sqlite3 (1.3.4)
subexec (0.0.4)
systemu (2.4.0)
term-ansicolor (1.0.7)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
twitter (1.5.0)
faraday (~> 0.6.1)
faraday_middleware (~> 0.6.3)
hashie (~> 1.0.0)
multi_json (~> 1.0.0)
multi_xml (~> 0.2.0)
rash (~> 0.3.0)
simple_oauth (~> 0.1.5)
typhoeus (0.2.4)
mime-types
mime-types
tzinfo (0.3.30)
uuidtools (2.1.2)
vegas (0.1.8)
rack (>= 1.0.0)
warden (1.0.6)
rack (>= 1.0)
webmock (1.6.2)
addressable (>= 2.2.2)
crack (>= 0.1.7)
will_paginate (3.0.pre2)
xml-simple (1.1.1)
yard (0.7.2)
yui-compressor (0.9.6)
POpen4 (>= 0.1.4)
PLATFORMS
ruby
DEPENDENCIES
SystemTimer (= 1.2.1)
activerecord-import
acts-as-taggable-on!
addressable (= 2.2.4)
aws (= 2.3.32)
bundler (>= 1.0.0)
capistrano (= 2.5.19)
capistrano-ext (= 1.2.1)
capybara (~> 0.3.9)
carrierwave (= 0.5.3)
chef (= 0.9.12)
client_side_validations
cloudfiles (= 1.4.10)
cucumber-api-steps
cucumber-rails (= 0.3.2)
database_cleaner (= 0.6.0)
devise (~> 1.3.1)
devise_invitable (= 0.5.0)
diaspora-client!
em-synchrony
em-websocket
excon (= 0.2.4)
factory_girl_rails
faraday
faraday-stack
fastercsv (= 1.5.4)
fixture_builder (= 0.3.0)
fog (= 0.3.25)
foreigner (= 0.9.1)
foreman
fuubar
haml (= 3.1.2)
hoptoad_notifier
http_accept_language!
i18n-inflector-rails (~> 1.0)
jammit (= 0.5.4)
jasmine (= 1.1.0.rc3)
json (= 1.4.6)
jwt (= 0.1.3)
linecache (= 0.43)
messagebus_ruby_api (= 0.4.8)
mini_magick (= 3.2)
mobile-fu
mock_redis
mongrel
mysql2 (= 0.2.13)
newrelic_rpm
nokogiri
oauth2-provider (= 0.0.16)
ohai (= 0.5.8)
omniauth (= 0.2.6)
parallel_tests
rails (= 3.0.10)
rails-i18n
redcarpet (= 2.0.0b5)
resque (= 1.10.0)
resque-ensure-connected
resque-timeout (= 1.0.0)
rest-client (= 1.6.1)
roxml!
rspec (>= 2.0.0)
rspec-core (= 2.6.0)
rspec-instafail (>= 0.1.7)
rspec-rails (>= 2.0.0)
ruby-debug
ruby-debug19
ruby-oembed
sass (= 3.1.7)
selenium-webdriver (~> 2.7.0)
settingslogic (= 2.0.6)
sod!
sqlite3
thin (= 1.2.11)
twitter (= 1.5.0)
typhoeus
vanna!
webmock
will_paginate (= 3.0.pre2)
yard