pubsub change
Merge branch 'master' of github.com:mperham/sidekiq
Update travis to test 2.2.0-preview1
Update web_helpers.rb

fix a bug about zh-cn support.
Merge pull request #1962 from wndfly/master

Update web_helpers.rb
Use warn for printing TTIN, so people don't configure away the ability to debug
Update .travis.yml
Delete deploy.rb
fix supported rails versions [ci skip]
Merge pull request #1964 from rselk/master

fix supported rails versions [ci skip]
Use deliver_now in Rails 4.2+, fixes #1933
1933
Deprecated delay extension for ActionMailer 4.2+
Merge pull request #1980 from seuros/deprecate

Deprecated delay extension for ActionMailer 4.2+
More explicit deprecation message
Latest Pro stuff
Added method to Util module to clean up process records that don't have
a matching heartbeat record, indicating that they're no longer alive.

Added call to this new util method in the Schedule::Poller.poll_interval
method because the number of live processes is used as a multiplier for
the default wait interval.  Since the value for poll_interval is
memoized this call to 'cleanup_dead_process_records' should only be
called once at startup.
Merge pull request #1984 from epchris/cleanup_processes

Added method to Util module to clean up process records...
Refactor #1984
Terminology: message -> job