Skip to content

Commit

Permalink
Merge branch 'master' into utc
Browse files Browse the repository at this point in the history
Conflicts:
	celery/beat.py
	celery/tests/test_task/test_task.py
	celery/utils/timeutils.py
	celery/worker/job.py
  • Loading branch information
ask committed Nov 8, 2011
2 parents 619367b + fc2d61d commit d8fd481
Show file tree
Hide file tree
Showing 225 changed files with 7,168 additions and 3,523 deletions.
180 changes: 95 additions & 85 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,85 +1,95 @@
Ordered by date of first contribution:
Ask Solem <[email protected]>
Grégoire Cachet <[email protected]>
Vitaly Babiy <[email protected]>
Brian Rosner <[email protected]>
Sean Creeley <[email protected]>
Ben Firshman <[email protected]>
Augusto Becciu <[email protected]>
Jonatan Heyman <[email protected]>
Mark Hellewell <[email protected]>
Jerzy Kozera <[email protected]>
Brad Jasper <[email protected]>
Wes Winham <[email protected]>
Timo Sugliani
Michael Elsdoerfer <[email protected]>
Jason Baker <[email protected]>
Wes Turner <[email protected]>
Maxim Bodyansky <[email protected]>
Rune Halvorsen <[email protected]>
Aaron Ross <[email protected]>
Adam Endicott
Jesper Noehr <[email protected]>
Mark Stover <[email protected]>
Andrew Watts <[email protected]>
Felix Berger <[email protected]
Reza Lotun <[email protected]>
Mikhail Korobov <[email protected]>
Jeff Balogh <[email protected]>
Patrick Altman <[email protected]>
Vincent Driessen <[email protected]>
Hari <[email protected]>
Bartosz Ptaszynski
Marcin Lulek <[email protected]>
Honza Kral <[email protected]>
Jonas Haag <[email protected]>
Armin Ronacher <[email protected]>
Gunnlaugur Thor Briem <[email protected]>
Mikhail Gusarov <[email protected]>
Frédéric Junod <[email protected]>
Lukas Linhart <[email protected]>
Clay Gerrard
David Miller <[email protected]>
Juarez Bochi <[email protected]>
Noah Kantrowitz <[email protected]>
Gert Van Gool <[email protected]>
sdcooke
David Cramer <[email protected]>
Bryan Berg <[email protected]>
Piotr Sikora <[email protected]>
Sam Cooke <[email protected]>
John Watson <[email protected]>
Martin Galpin <[email protected]>
Chris Rose <[email protected]>
Christopher Peplin <[email protected]>
David White <[email protected]>
Vladimir Kryachko <[email protected]>
Simon Josi <[email protected]>
jpellerin
Norman Richards <[email protected]>
Christoph Burgmer <[email protected]>
Allan Caffee <[email protected]>
Ales Zoulek <[email protected]>
Roberto Gaiser <[email protected]>
Balachandran C <[email protected]>
Kevin Tran <[email protected]>
Branko Čibej <[email protected]>
Jeff Terrace <[email protected]>
Ryan Petrello <[email protected]>
Marcin Kuźmiński <[email protected]>
Adriano Petrich <[email protected]>
David Strauss <[email protected]>
David Arthur <[email protected]>
Miguel Hernandez Martos <[email protected]>
Jannis Leidel <[email protected]>
Harm Verhagen <[email protected]>
lookfwd <[email protected]>
Mauro Rocco <[email protected]>
Matthew J Morrison <[email protected]>
Daniel Watkins <[email protected]>
Remy Noel <[email protected]>
Leo Dirac <[email protected]>
Greg Haskins <[email protected]>
Stefan Kjartansson <[email protected]>
Chris Adams <[email protected]>
Steeve Morin <[email protected]>
=========
AUTHORS
=========
:order: sorted

Aaron Ross <[email protected]>
Adam Endicott
Adriano Petrich <[email protected]>
Ales Zoulek <[email protected]>
Allan Caffee <[email protected]>
Andrew Watts <[email protected]>
Armin Ronacher <[email protected]>
Ask Solem <[email protected]>
Augusto Becciu <[email protected]>
Balachandran C <[email protected]>
Bartosz Ptaszynski
Ben Firshman <[email protected]>
Brad Jasper <[email protected]>
Branko Čibej <[email protected]>
Brian Rosner <[email protected]>
Bryan Berg <[email protected]>
Chase Seibert <[email protected]>
Chris Adams <[email protected]>
Chris Rose <[email protected]>
Christoph Burgmer <[email protected]>
Christopher Peplin <[email protected]>
Clay Gerrard
Dan McGee <[email protected]>
Daniel Watkins <[email protected]>
David Arthur <[email protected]>
David Cramer <[email protected]>
David Miller <[email protected]>
David Strauss <[email protected]>
David White <[email protected]>
Felix Berger <[email protected]
Frédéric Junod <[email protected]>
Gert Van Gool <[email protected]>
Greg Haskins <[email protected]>
Grégoire Cachet <[email protected]>
Gunnlaugur Thor Briem <[email protected]>
Hari <[email protected]>
Harm Verhagen <[email protected]>
Honza Kral <[email protected]>
Jannis Leidel <[email protected]>
Jason Baker <[email protected]>
Jeff Balogh <[email protected]>
Jeff Terrace <[email protected]>
Jerzy Kozera <[email protected]>
Jesper Noehr <[email protected]>
John Watson <[email protected]>
Jonas Haag <[email protected]>
Jonatan Heyman <[email protected]>
Joshua Ginsberg <[email protected]>
Juarez Bochi <[email protected]>
Kevin Tran <[email protected]>
Kornelijus Survila <[email protected]>
Leo Dirac <[email protected]>
Lukas Linhart <[email protected]>
Marcin Kuźmiński <[email protected]>
Marcin Lulek <[email protected]>
Mark Hellewell <[email protected]>
Mark Stover <[email protected]>
Martin Galpin <[email protected]>
Matthew J Morrison <[email protected]>
Mauro Rocco <[email protected]>
Maxim Bodyansky <[email protected]>
Michael Elsdoerfer <[email protected]>
Miguel Hernandez Martos <[email protected]>
Mikhail Gusarov <[email protected]>
Mikhail Korobov <[email protected]>
Neil Chintomby <[email protected]>
Noah Kantrowitz <[email protected]>
Norman Richards <[email protected]>
Patrick Altman <[email protected]>
Piotr Sikora <[email protected]>
Remy Noel <[email protected]>
Reza Lotun <[email protected]>
Roberto Gaiser <[email protected]>
Rune Halvorsen <[email protected]>
Ryan Petrello <[email protected]>
Sam Cooke <[email protected]>
Sean Creeley <[email protected]>
Simon Josi <[email protected]>
Steeve Morin <[email protected]>
Stefan Kjartansson <[email protected]>
Timo Sugliani
Vincent Driessen <[email protected]>
Vitaly Babiy <[email protected]>
Vladimir Kryachko <[email protected]>
Wes Turner <[email protected]>
Wes Winham <[email protected]>
jpellerin
kuno <[email protected]>
lookfwd <[email protected]>
sdcooke
Loading

0 comments on commit d8fd481

Please sign in to comment.