1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Merge branch 'master' of github.com:mperham/sidekiq

This commit is contained in:
Mike Perham 2015-10-01 10:18:36 -07:00
commit 291b12b84d
2 changed files with 2 additions and 2 deletions

View file

@ -74,7 +74,7 @@ In no event will Contributed Systems' liability exceed the Software license pric
13.1 Entire Agreement. This Agreement sets forth our entire agreement with respect to the Software and the subject matter hereof and supersedes all prior and contemporaneous understandings and agreements whether written or oral. 13.1 Entire Agreement. This Agreement sets forth our entire agreement with respect to the Software and the subject matter hereof and supersedes all prior and contemporaneous understandings and agreements whether written or oral.
13.2 Amendment. Contributed Systems reserves the right, in its sole discretion, to amend this Agreement from time. Amendments to thie Agreement can be located at: https://github.com/mperham/sidekiq/blob/master/COMM-LICENSE. 13.2 Amendment. Contributed Systems reserves the right, in its sole discretion, to amend this Agreement from time. Amendments to this Agreement can be located at: https://github.com/mperham/sidekiq/blob/master/COMM-LICENSE.
13.3 Assignment. You may not assign this Agreement or any of its rights under this Agreement without the prior written consent of Contributed Systems and any attempted assignment without such consent shall be void. 13.3 Assignment. You may not assign this Agreement or any of its rights under this Agreement without the prior written consent of Contributed Systems and any attempted assignment without such consent shall be void.

View file

@ -408,7 +408,7 @@ middleware, see 3.0-Upgrade.md.**
[Testing](https://github.com/mperham/sidekiq/wiki/Testing) for detail. [#1193] [Testing](https://github.com/mperham/sidekiq/wiki/Testing) for detail. [#1193]
- The Retries table has a new column for the error message. - The Retries table has a new column for the error message.
- The Web UI topbar now contains the status and live poll button. - The Web UI topbar now contains the status and live poll button.
- Orphaned worker records are now auto-vacuumed when you vist the - Orphaned worker records are now auto-vacuumed when you visit the
Workers page in the Web UI. Workers page in the Web UI.
- Sidekiq.default\_worker\_options allows you to configure default - Sidekiq.default\_worker\_options allows you to configure default
options for all Sidekiq worker types. options for all Sidekiq worker types.