summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #134 from wizzat/conn_refactorv0.9.0Dana Powers2014-03-215-39/+133
|\
| * Merge branch 'master' into conn_refactorMark Roberts2014-03-183-5/+15
| |\
| * | Update load_exampleMark Roberts2014-02-261-2/+2
| * | Merge branch 'master' into conn_refactorMark Roberts2014-02-268-32/+155
| |\ \
| * | | Fix grammar in error stringMark Roberts2014-02-251-1/+1
| * | | Update logging config to include timestamps for better/easier debuggingMark Roberts2014-02-252-2/+8
| * | | Minor refactor in conn.py, update version in __init__.py, add ErrorStringMark Roberts2014-02-254-27/+36
| * | | Update example.py to compile, add friendly load_example.pyMark Roberts2014-02-252-13/+92
* | | | Merge pull request #109 from mrtheb/developDana Powers2014-03-215-31/+207
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pull request #1 from wizzat/pr109Marc Labbé2014-03-202-18/+18
| |\ \ \
| | * | | Fix py26 compatibility issue, add mock to toxMark Roberts2014-03-182-18/+18
| |/ / /
| * | | Merge branch 'master' into developmrtheb2014-03-1710-52/+303
| |\ \ \
| * | | | fixing _get_leader_for_partition unittestsmrtheb2014-02-151-6/+6
| * | | | Changes based on comments by @rdiomar, plus added LeaderUnavailableError for ...mrtheb2014-02-153-8/+15
| * | | | check for broker None in send_broker_aware_request (added test for it)mrtheb2014-01-312-5/+42
| * | | | Merge branch 'master' into developmrtheb2014-01-314-128/+168
| |\ \ \ \
| * | | | | Handle cases for partition with leader=-1 (not defined)Marc Labbe2014-01-313-58/+77
| * | | | | removed commented out linesmrtheb2014-01-191-3/+0
| * | | | | added mockmrtheb2014-01-183-11/+134
* | | | | | Merge pull request #144 from frgtn/check_basestring_in_collect_hostsMarc Labbé2014-03-172-1/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Check against basestring instead of str in collect.hosts.Saulius Zemaitaitis2014-03-172-1/+11
|/ / / / /
* | | | | Merge pull request #141 from stephenarmstrong/fully-handle-broker-listsOmar2014-03-131-3/+3
|\ \ \ \ \
| * | | | | If a broker refuses the connection, try the nextstephenarmstrong2014-03-131-3/+3
|/ / / / /
* | | | | Merge pull request #138 from zever/masterOmar2014-03-041-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | nit: fixed misspellingZack Dever2014-03-031-1/+1
|/ / / /
* | | | Merge pull request #122 from mrtheb/multihostsOmar2014-02-268-31/+154
|\ \ \ \ | |_|_|/ |/| | |
| * | | clean up after comments from @rdiomarmrtheb2014-02-152-133/+11
| * | | Support list (or comma-separated) of hosts (replaces host and port arguments)mrtheb2014-02-094-28/+56
| * | | Merge branch 'master' into multihostsmrtheb2014-01-3113-667/+1017
| |\ \ \ | | | |/ | | |/|
| * | | Allow KafkaClient to take in a list of brokers for bootstrappingMarc Labbe2013-11-148-39/+256
* | | | Fix version in __init__.py to match setup.pyDavid Arthur2014-02-251-1/+1
* | | | Merge pull request #127 from GregBowyer/masterDana Powers2014-02-252-3/+138
|\ \ \ \ | |_|/ / |/| | |
| * | | Make it possible to read and write xerial snappyGreg Bowyer2014-02-192-3/+138
|/ / /
* | | Merge pull request #111 from rdiomar/multitopic_producersDana Powers2014-01-303-89/+98
|\ \ \
| * | | Use TopicAndPartition when producing async messagesOmar Ghishan2014-01-271-8/+11
| * | | Make producers take a topic argument at send rather than init timeOmar Ghishan2014-01-233-88/+94
| | |/ | |/|
* | | Resolve conflicts for #106Omar Ghishan2014-01-281-39/+70
|\ \ \ | |/ / |/| |
| * | Add doc string for SimpleConsumer._get_message()Omar Ghishan2014-01-201-0/+6
| * | Make get_messages() update and commit offsets just before returningOmar Ghishan2014-01-151-16/+35
| * | Only use timeout if it's not NoneOmar Ghishan2014-01-151-4/+5
| * | Store fetched offsets separately.Omar Ghishan2014-01-151-10/+14
| * | Fix offset increments:Omar Ghishan2014-01-151-16/+17
* | | Merge pull request #107 from rdiomar/fix_default_timeoutsMarc Labbé2014-01-162-3/+13
|\ \ \
| * | | Change default socket timeout to 120 seconds in both the client and connectionOmar Ghishan2014-01-162-5/+10
| * | | Make the default connection timeout NoneOmar Ghishan2014-01-161-1/+6
| |/ /
* | | Merge pull request #102 from cosbynator/masterOmar2014-01-162-4/+4
|\ \ \
| * | | 0.9.0Thomas Dimson2014-01-152-4/+4
| * | | Update README.md tooThomas Dimson2014-01-151-1/+1
| * | | Version bumpThomas Dimson2014-01-151-1/+1
* | | | Merge pull request #98 from waliaashish85/devOmar2014-01-161-4/+2
|\ \ \ \ | |/ / / |/| | |