summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix CHANGES.rst 'Title underline too short.' issue2.2.1Joshua Harlow2015-06-171-1/+1
* Release for 2.2.1 (bug fixes)Joshua Harlow2015-06-172-2/+2
* Merge pull request #340 from rgs1/fix-nameerror-basestringJoshua Harlow2015-06-172-3/+16
|\
| * Fix NameError with basestring (in py3k)Raul Gutierrez S2015-06-162-3/+16
|/
* Merge pull request #339 from harlowja/switch-badge-site2.2Ben Bangert2015-06-151-2/+2
|\
| * Move badges from pypip.in to shields.ioJoshua Harlow2015-06-151-2/+2
* | Merge pull request #338 from harlowja/fix-2.2-changelogBen Bangert2015-06-151-3/+3
|\ \ | |/ |/|
| * Fix up changelog for 2.2Joshua Harlow2015-06-151-3/+3
|/
* Merge pull request #336 from harlowja/version-2.2Ben Bangert2015-06-152-14/+6
|\
| * Bump version up to 2.2Joshua Harlow2015-06-122-14/+6
* | Merge pull request #337 from harlowja/type-error-stringsJoshua Harlow2015-06-151-4/+5
|\ \ | |/ |/|
| * Reformat messages in type error exceptions strings in reconfigJoshua Harlow2015-06-121-4/+5
|/
* Merge pull request #333 from rgs1/support-reconfigJoshua Harlow2015-06-095-0/+179
|\
| * Add support for reconfig cluster membership operation (issue #234)Raul Gutierrez S2015-06-025-0/+179
|/
* Merge pull request #330 from harlowja/fix-venvs-travisBen Bangert2015-06-014-13/+31
|\
| * Have the 3.5.0-alpha just use the basic py27 envJoshua Harlow2015-05-291-1/+1
| * Bump up eventlet + gevent version to be newerJoshua Harlow2015-05-292-2/+2
| * Reduce tox envs and do basic eventlet + gevent onlyJoshua Harlow2015-05-293-36/+18
| * Leave out adding eventlet to py33/py33 for nowJoshua Harlow2015-05-282-9/+1
| * Fix up tox envs and there usage in travisJoshua Harlow2015-05-283-10/+54
* | Merge pull request #332 from arnimarj/masterJoshua Harlow2015-05-291-1/+1
|\ \
| * | replacing sys.stderr(...) with sys.stderr.write(...)worker bee2015-05-301-1/+1
|/ /
* | Merge pull request #327 from hannosch/travis-cacheBen Bangert2015-05-284-6/+19
|\ \
| * | Use the new apt addon to install libevent-dev.Hanno Schlichting2015-05-281-0/+5
| * | Make use of the new travis-ci caching mechanism.Hanno Schlichting2015-05-284-6/+14
| |/
* | Merge pull request #322 from harlowja/better-cleanupBen Bangert2015-05-284-65/+86
|\ \
| * | Do cleanup in a more more robust mannerJoshua Harlow2015-05-274-65/+86
* | | Merge pull request #318 from harlowja/fix-at-exit-registerBen Bangert2015-05-281-1/+1
|\ \ \ | |_|/ |/| |
| * | At exit register takes *args and **kwargs not args and kargsJoshua Harlow2015-05-271-1/+1
| |/
* | Merge pull request #321 from harlowja/fixed-sempahoreBen Bangert2015-05-271-5/+30
|\ \
| * | Use a mini-watch helper to ensure timeout is decreasedJoshua Harlow2015-05-271-2/+24
| * | Fix semaphore usageJoshua Harlow2015-05-271-4/+7
| |/
* | Merge pull request #319 from harlowja/compat-at-exitBen Bangert2015-05-271-1/+3
|\ \ | |/ |/|
| * Use the compat layer for atexit functionalityJoshua Harlow2015-05-271-1/+3
|/
* Bump __version__ for 2.1.1Joshua Harlow2015-05-261-1/+1
* Denote 2.1.1 section in changelogJoshua Harlow2015-05-261-0/+12
* Merge pull request #316 from harlowja/fix-lock-non-blockingBen Bangert2015-05-263-5/+39
|\
| * Tweak bug handling section a littleJoshua Harlow2015-05-111-1/+2
| * Add a entry into the bug handling changelog sectionJoshua Harlow2015-05-111-0/+3
| * Add tests that continue to ensure non-blocking worksJoshua Harlow2015-05-111-5/+33
| * Stop retrying when already acquired and non-blockingJoshua Harlow2015-05-111-0/+2
* | Merge pull request #314 from harlowja/22sectionsBen Bangert2015-05-111-0/+9
|\ \ | |/
| * Add standard changelog sections for 2.2Joshua Harlow2015-05-111-0/+9
|/
* Merge pull request #313 from harlowja/fix_2_1_year2.1Ben Bangert2015-05-111-1/+1
|\
| * Wrong year for 2.1 releaseJoshua Harlow2015-05-111-1/+1
|/
* Merge pull request #312 from harlowja/release_2_1Ben Bangert2015-05-112-3/+6
|\
| * Release 2.1 and mark 2.2 as unreleasedJoshua Harlow2015-05-112-3/+6
|/
* Merge pull request #308 from harlowja/add-badgesBen Bangert2015-05-111-0/+12
|\
| * Add travis + latest version + monthly download badgesJoshua Harlow2015-04-171-0/+12
* | Merge pull request #299 from harlowja/same-type-error-formatBen Bangert2015-05-111-2/+1
|\ \
View Lorry Controller Status