浏览代码

Merge branch 'master' of github.com:celery/celery

Ask Solem 12 年之前
父节点
当前提交
4a627c64dc
共有 2 个文件被更改,包括 1 次插入1 次删除
  1. 0 1
      celery/worker/autoreload.py
  2. 1 0
      docs/contributing.rst

+ 0 - 1
celery/worker/autoreload.py

@@ -201,7 +201,6 @@ class InotifyMonitor(_ProcessEvent):
 
 
 
 
 def default_implementation():
 def default_implementation():
-    # kqueue monitor not working properly at this time.
     if hasattr(select, 'kqueue'):
     if hasattr(select, 'kqueue'):
         return 'kqueue'
         return 'kqueue'
     if sys.platform.startswith('linux') and pyinotify:
     if sys.platform.startswith('linux') and pyinotify:

+ 1 - 0
docs/contributing.rst

@@ -710,6 +710,7 @@ Mher Movsisyan
 ~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~
 
 
 :github: https://github.com/mher
 :github: https://github.com/mher
+:twitter: http://twitter.com/#!/movsm
 
 
 Steeve Morin
 Steeve Morin
 ~~~~~~~~~~~~
 ~~~~~~~~~~~~