Permalink
Commits on Jun 24, 2017
  1. Merge pull request #1002 from mikhtonyuk/1001-conflict-exit-codes

    Fixing #1001 - non-zero exit code on conflict errors
    tarekziade committed on GitHub Jun 24, 2017
  2. Merge pull request #1000 from mikhtonyuk/998-premature-shutdown

    Fix #998 - premature shutdown leaking processes
    tarekziade committed on GitHub Jun 24, 2017
  3. Merge pull request #999 from mikhtonyuk/997-reloadconfig-numproc

    Fix #997 - reloadconfig concurrency
    tarekziade committed on GitHub Jun 24, 2017
Commits on Jun 2, 2015
  1. more coveralls tweakings

    tarekziade committed Jun 2, 2015
  2. relative path

    tarekziade committed Jun 2, 2015
  3. fixed travis image link

    tarekziade committed Jun 2, 2015
Commits on Nov 28, 2014
  1. Merge pull request #856 from methane/fix-py34

    Fix test failure on Python 3
    tarekziade committed Nov 28, 2014
  2. Merge pull request #832 from wynnw/feature/fix-rlimits-addwatcher

    various fixes for the addwatcher command and rlimit settings
    tarekziade committed Nov 28, 2014
  3. Merge pull request #850 from scottkmaxwell/use_papa

    Use papa process kernel
    tarekziade committed Nov 28, 2014
  4. Merge pull request #842 from k4nar/remove_close_timeout

    Remove timeout in Arbiter._stop
    tarekziade committed Nov 28, 2014
  5. Merge pull request #843 from k4nar/close_statsd

    Stop the Stats daemon properly when killed.
    tarekziade committed Nov 28, 2014
  6. Merge pull request #848 from scottkmaxwell/fix_flake8_warnings_for_py…

    …thon3.x
    
    Make flake8 happy from Python 3
    tarekziade committed Nov 28, 2014
  7. Merge pull request #854 from methane/py34

    Add test env for Python 3.4
    tarekziade committed Nov 28, 2014
  8. Merge pull request #844 from k4nar/join_thread_issue

    Don't use patched Thread._stop with python > 2.7 or 3.2
    tarekziade committed Nov 28, 2014
Commits on Sep 23, 2014
  1. yahoo changed its url

    tarekziade committed Sep 23, 2014
Commits on Sep 19, 2014
  1. changed org name

    tarekziade committed Sep 19, 2014
  2. moved to an org

    tarekziade committed Sep 19, 2014
  3. Merge pull request #827 from eikonomega/patch-1

    Add example YAML for loggerconfig option
    tarekziade committed Sep 19, 2014
Commits on Sep 18, 2014
  1. Merge pull request #833 from eikonomega/patch-1

    Add pyyaml as a requirement.
    tarekziade committed Sep 18, 2014
Commits on Aug 18, 2014
  1. Merge pull request #824 from catatsuy/issues/387

    debian/circus.init should use --log-output
    tarekziade committed Aug 18, 2014
Commits on Aug 7, 2014
  1. Merge pull request #777 from wynnw/feature/rm-forget

    feature/rm-forget
    tarekziade committed Aug 7, 2014
  2. Merge pull request #812 from scottkmaxwell/simplified_threading_patch

    Remove patch of _bootstrap_inner since it should not be necessary and it...
    tarekziade committed Aug 7, 2014
  3. Merge pull request #820 from mgaitan/patch-2

    circus-web's Nginx Doc update
    tarekziade committed Aug 7, 2014
Commits on Jun 30, 2014
  1. Merge pull request #813 from mozilla-services/pyzmq_requirement_version

    Set minimum pyzmq version in setup.py
    tarekziade committed Jun 30, 2014
  2. Merge pull request #805 from morganbohn/master

    add an option to specify the python version of the virtualenv
    tarekziade committed Jun 30, 2014
Commits on Jun 20, 2014
  1. Merge pull request #807 from gdraynz/patch-1

    Tornado must be at version 3.0 or higher
    tarekziade committed Jun 20, 2014
Commits on Jun 19, 2014
Commits on Jun 9, 2014
  1. Merge pull request #788 from k4nar/windows

    Windows support
    tarekziade committed Jun 9, 2014
Commits on Jun 6, 2014
  1. Merge pull request #800 from thunderk/787-fd-inheritance-py34

    Fix file descriptor inheritance problem with python3.4 (#787)
    tarekziade committed Jun 6, 2014
Commits on Jun 3, 2014
  1. Merge pull request #798 from SalesSeek/debian-init-config-to-variable

    Move configuration file to a variable for ease of customization.
    tarekziade committed Jun 3, 2014
  2. Merge pull request #796 from schlamar/patch-2

    Do not swallow unhandled exception on Python 2.
    tarekziade committed Jun 3, 2014
  3. Merge pull request #797 from schlamar/patch-3

    Do not run setup.py develop in tox.
    tarekziade committed Jun 3, 2014
  4. Merge pull request #792 from schlamar/dependencies

    Moved dependencies into tox.ini.
    tarekziade committed Jun 3, 2014