summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authormrtheb <mrlabbe@gmail.com>2014-03-17 15:43:00 -0400
committermrtheb <mrlabbe@gmail.com>2014-03-17 15:43:00 -0400
commit19646b1f1f9fae38c3075a9a56b8e7a9d395ff8e (patch)
tree421d3e2d628e8b564eecde6a4efcd4edac31d1ff /setup.py
parent828133cff064f4f8fba753183ac21619355ac005 (diff)
parent32edabdaaff6746e4926cc897b4bba917a80cb54 (diff)
downloadkafka-python-19646b1f1f9fae38c3075a9a56b8e7a9d395ff8e.tar.gz
Merge branch 'master' into develop
Conflicts: test/test_unit.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index fe951e7..009e14f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@ from setuptools import setup, Command
class Tox(Command):
+
user_options = []
def initialize_options(self):