Skip to content

Commit

Permalink
Merge branch 'master' into feature/generalized-start-script
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Chekaluk committed Jan 10, 2014
2 parents e353f10 + 7e6929d commit cac620e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@

- Fix race condition in bulk requeue during shutdown [#1406]
- Fix bug where strictly prioritized queues might be processed out of
order [#1408]
order [#1408]. A side effect of this change is that it breaks a queue
declaration syntax that worked, although only because of a bug—it was
never intended to work and never supported. If you were declaring your
queues as a comma-separated list, e.g. `sidekiq -q critical,default,low`,
you must now use the `-q` flag before each queue, e.g.
`sidekiq -q critical -q default -q low`.

2.17.1
-----------
Expand Down
3 changes: 2 additions & 1 deletion Pro-Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ Sidekiq Pro Changelog

Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.

HEAD
1.4.1
-----------

- Add batch progress bar to batch detail page. [#1398]
- Fix race condition in initializing Lua scripts


1.4.0
Expand Down

0 comments on commit cac620e

Please sign in to comment.