Commit Graph

86 Commits

Author SHA1 Message Date
Ask Solem ef40626818 Merge branch '2.5'
Conflicts:
	Changelog
	README.rst
	kombu/__init__.py
	kombu/messaging.py
	kombu/mixins.py
	kombu/tests/test_serialization.py
	kombu/tests/utilities/test_encoding.py
	kombu/transport/filesystem.py
	kombu/transport/pyamqp.py
	requirements/default.txt
	setup.py
	tox.ini
2013-09-10 14:53:36 +01:00
Ask Solem 867f66c11b Adds Vince Gonzalez to AUTHORS 2013-09-09 17:18:21 +01:00
Ask Solem 5f290f5c6a Adds Corentin Ardeois to AUTHORS 2013-08-16 15:45:43 +01:00
Ask Solem 3b73fbfdbd Adds Sascha Peilicke to AUTHORS 2013-08-16 15:36:49 +01:00
Ask Solem b7b1538836 Updates AUTHOR entry 2013-08-14 13:10:35 +01:00
Ask Solem 98e164316a Updates AUTHOR entry 2013-08-14 13:10:16 +01:00
Ask Solem a7abe9bf67 Adds Tommie McAfee to AUTHORS 2013-06-25 11:20:34 +01:00
Ask Solem 415dcc5ff8 Merge branch '2.5'
Conflicts:
	kombu/transport/mongodb.py
2013-05-14 15:29:48 +01:00
Ask Solem 7f9674419b Adds John Shuping to AUTHORS 2013-05-14 15:29:11 +01:00
Ask Solem 2039e3c20c Merge branch '2.5' 2013-05-01 17:58:36 +01:00
Ask Solem 7b968eae83 Adds Jonathan Halcrow to AUTHORS 2013-05-01 17:58:30 +01:00
Ask Solem efa14fc7d4 Adds Dhananjay Nene to AUTHORS 2013-04-18 10:37:48 +01:00
Ask Solem 4146118de3 Merge branch '2.5'
Conflicts:
	Changelog
	kombu/utils/eventio.py
2013-04-17 15:19:29 +01:00
Ask Solem b1b52e6800 Adds Rafal Malinowski to AUTHORS 2013-04-17 12:42:42 +01:00
Ask Solem 81094e47ff Adds Dan LaMotte to AUTHORS 2013-04-17 12:36:43 +01:00
Ask Solem 5413e96df8 Merge branch '2.5'
Conflicts:
	README.rst
	kombu/__init__.py
	kombu/connection.py
	kombu/transport/redis.py
	requirements/default.txt
2013-03-12 17:07:11 +00:00
Ask Solem 4a3f009214 Adds Ephemera to AUTHORS 2013-03-12 17:05:50 +00:00
Ask Solem 1f89f5e5de Adds Kevin McDonald to AUTHORS 2013-02-07 15:45:04 +00:00
Ask Solem 67d2fa4744 Merge branch '2.5'
Conflicts:
	pavement.py
2013-02-07 15:38:15 +00:00
Ask Solem 7c5dc19be1 Adds Alex Koshelev to AUTHORS 2013-02-07 15:37:46 +00:00
Ask Solem 17159d9efc Adds Basil Mironenko to AUTHORS 2013-01-11 15:22:47 +00:00
Ask Solem 996e395729 Adds Basil Mironenko to AUTHORS 2013-01-11 15:22:19 +00:00
Ask Solem 7303f11eac Merge branch '2.5' 2013-01-11 15:08:45 +00:00
Ask Solem 9c20247b7d Adds James Saryerwinnie to AUTHORS 2013-01-11 15:08:41 +00:00
Ask Solem 8577ba8c40 Adds Andrey Antukh <niwi@niwi.be> to AUTHORS 2012-12-10 15:45:02 +00:00
Ask Solem ad5d4c6a3d Adds Andrey Antukh <niwi@niwi.be> to AUTHORS 2012-12-10 15:44:45 +00:00
Ask Solem 14cb9f0720 Adds Viet Hung Nguyen to AUTHORS 2012-12-10 15:42:42 +00:00
Ask Solem f9e09b65f5 Adds Dane Guempel to AUTHORS 2012-12-10 15:23:40 +00:00
Ask Solem d687394381 Adds Dane Guempel to AUTHORS 2012-12-10 15:20:40 +00:00
Ask Solem a103d728bb Adds Ollie Walsh to AUTHORS 2012-11-16 12:35:55 +00:00
Ask Solem 5deb7b8240 Adds Kevin McCarthy to AUTHORS 2012-11-02 14:18:43 +00:00
Ask Solem 797f2456aa Adds Jasper Bryant-Greene to AUTHORS 2012-10-23 11:44:27 +01:00
Ask Solem 30757ac944 Adds Rumyana Neykova to AUTHORS 2012-09-21 14:21:10 +01:00
Ask Solem e7a45afb35 Adds C Anthony Risinger to AUTHORS 2012-07-31 14:46:22 +01:00
Ask Solem d25a12868c Adds Bobby Beever to AUTHORS 2012-07-05 14:50:35 +01:00
Ask Solem 8e06470d7a Adds Seb Insua to AUTHORS 2012-07-05 14:29:48 +01:00
Ask Solem ac5733ea0a Adds John Watson to AUTHORS 2012-06-22 13:06:06 +01:00
Ask Solem faa307ee9c Adds Mahendra M to AUTHORS 2012-06-07 15:07:13 +01:00
Ask Solem 61002ed256 Adds Thomas Johansson to AUTHORS 2012-05-16 17:20:55 +01:00
Ask Solem 152679ee8b Adds Franck Cuny to AUTHORS 2012-05-14 12:40:43 +01:00
Ask Solem d7222ad427 Adds Zhao Xiaohong to AUTHORS 2012-05-14 12:35:36 +01:00
Ask Solem a2c3adf481 Adds German M. Bravo to AUTHORS 2012-05-03 15:25:01 +01:00
Ask Solem a902755fab Adds Joseph Crosland to AUTHORS 2012-04-23 13:20:48 +01:00
Ask Solem 21cd749ef7 Adds Michael Barrett to AUTHORS 2012-04-10 16:28:10 +01:00
Ask Solem 554d1dcdb6 Adds Andrii Kostenko to AUTHORS 2012-04-10 16:13:52 +01:00
Ask Solem eb6216aeae Adds Stephan Jaekel to AUTHORS 2012-03-23 17:26:29 +00:00
Ask Solem 8b327c5aae Adds Florian Munz to AUTHORS 2012-02-22 14:36:41 +00:00
Ask Solem 015f3b5b17 Adds Steeve Morin to AUTHORS 2012-02-08 15:54:51 +00:00
Ask Solem baaaf3604f Adds Scott Lyons to AUTHORS 2012-02-03 15:09:23 +00:00
Ask Solem 5d2831125f Adds Pierre Riteau to AUTHORS 2012-01-20 21:55:38 +00:00