Permalink
Commits on Sep 30, 2018
  1. Merge pull request #2903 from liyongxin/master

    allencloud committed Sep 30, 2018
    typo fix about sentinel
Commits on Sep 27, 2018
  1. typo fix about sentinel

    liyongxin committed Sep 27, 2018
    Signed-off-by: Yongxin Li <yxli@alauda.io>
Commits on Sep 21, 2018
  1. Merge pull request #2898 from mirake/fix-typo

    allencloud committed Sep 21, 2018
    Fix typo: yeild -> yield
Commits on Sep 14, 2018
  1. Fix typo: yeild -> yield

    mirake committed Sep 7, 2018
    Signed-off-by: Rui Cao <ruicao@alauda.io>
Commits on Jun 13, 2018
  1. Maintainers file: fix TOML format, and remove docs section (#2874)

    thaJeztah authored and dani-docker committed Jun 13, 2018
    * Fix invalid TOML
    
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    
    * Remove docs section from maintainers
    
    Documentation was moved to the documentation
    repository
    
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Commits on Jun 1, 2018
  1. Merge pull request #2870 from nishanttotla/bump-v1.2.9

    dani-docker committed Jun 1, 2018
    Bump version to v1.2.9
  2. Bump version to v1.2.9

    nishanttotla committed Jun 1, 2018
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
  3. Merge pull request #2867 from nishanttotla/new-curators

    nishanttotla committed Jun 1, 2018
    Adding Anshul Pundir and David Chung as curators
Commits on May 31, 2018
  1. Adding Anshul Pundir and David Chung as curators to help with issue t…

    nishanttotla committed May 31, 2018
    …riaging
    
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Commits on May 30, 2018
  1. Merge pull request #2863 from nishanttotla/add-dani-louca-maintainer

    nishanttotla committed May 30, 2018
    Adding Dani Louca to MAINTAINERS
Commits on May 29, 2018
  1. Adding Dani Louca to MAINTAINERS

    nishanttotla committed May 29, 2018
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
  2. Merge pull request #2858 from lioncruise/patch-1

    nishanttotla committed May 29, 2018
    Update copyright time to 2018
  3. Update copyright time to 2018

    lioncruise authored and Shijun Qin committed May 3, 2018
    Update copyright time from 2016 to 2018.
    
    Signed-off-by: Shijun Qin <272700767@qq.com>
Commits on May 18, 2018
  1. Merge pull request #2860 from dani-docker/esc-357

    nishanttotla committed May 18, 2018
    Force resume refreshLoop when engine status changes to healthy
Commits on May 9, 2018
  1. Force resume refreshLoop when engine stat becomes healthy

    dani-docker committed May 5, 2018
    Signed-off-by: Dani Louca <dani.louca@docker.com>
    
    Adding test
    
    Signed-off-by: Dani Louca <dani.louca@docker.com>
Commits on Apr 16, 2018
  1. Merge pull request #2853 from nishanttotla/remove-mesos-integration

    nishanttotla committed Apr 16, 2018
    Remove Mesos integration
Commits on Apr 12, 2018
  1. Removing CLI for mesos integration

    nishanttotla committed Apr 12, 2018
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
  2. Removing mesos integration tests

    nishanttotla committed Apr 12, 2018
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
  3. Remove mesos-go vendor package

    nishanttotla committed Apr 12, 2018
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
  4. Remove Swarm-Mesos integration package

    nishanttotla committed Apr 12, 2018
    Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Commits on Mar 28, 2018
  1. Merge pull request #2846 from dani-docker/esc-305v2

    nishanttotla committed Mar 28, 2018
    Address concurrency issue (Refactor)
  2. Refactoring the original lock fix as it caused other read routines, e…

    dani-docker committed Mar 9, 2018
    …x: docker info, to be slow waiting to acquire the lock while RefreshContainer doing api calls
    
    Signed-off-by: Dani Louca <dani.louca@docker.com>
    
    Fix noisy benign error messages
    
    Signed-off-by: Dani Louca <dani.louca@docker.com>
Commits on Mar 9, 2018
  1. Merge pull request #2842 from wsong/fix_deadlock

    nishanttotla authored and dani-docker committed Feb 15, 2018
    Fix a deadlock in RefreshContainers
    
    Revert "Merge pull request #2842 from wsong/fix_deadlock"
    
    This reverts commit 5e89a03, reversing
    changes made to 905a2fb.
    
    Revert "Address race condition in RefreshContainers"
    
    This reverts commit 85bee20.
Commits on Feb 15, 2018
  1. Merge pull request #2842 from wsong/fix_deadlock

    nishanttotla committed Feb 15, 2018
    Fix a deadlock in RefreshContainers
Commits on Feb 13, 2018
  1. Fix a deadlock in RefreshContainers

    wsong committed Feb 13, 2018
    Signed-off-by: Wayne Song <wsong@docker.com>
Commits on Feb 12, 2018
  1. Merge pull request #2840 from wsong/log_failures

    nishanttotla committed Feb 12, 2018
    Fail VolumeCreate requests if they fail on any node
Commits on Feb 7, 2018
  1. Fail VolumeCreate requests if they fail on any node

    wsong committed Feb 7, 2018
    Also log failures
    
    Signed-off-by: Wayne Song <wsong@docker.com>
Commits on Jan 26, 2018
  1. Merge pull request #2837 from dperny/fix-unsynchronized-time

    nishanttotla committed Jan 26, 2018
    Fix possible errant time computation
Commits on Jan 25, 2018
  1. Fix possible errant time computation

    dperny committed Jan 25, 2018
    In cluster/engine.go, we compute a delta between the manager and the
    engine. However, we do several blocking operations between the time we
    get the engine info, and the time we get the manager system. If those
    blocking operations take an abnormally long time, the user will be
    warned of a long time split, and the delta will be incorrect.
    
    This patch moves computation of the delta to immediately after the Info
    call, so that the subsequent blocking operations do not affect it.
    
    Signed-off-by: Drew Erny <drew.erny@docker.com>
Commits on Jan 24, 2018
  1. Merge pull request #2836 from dani-docker/esc-322

    nishanttotla committed Jan 24, 2018
    Address concurrent map r/w panic
  2. avoid concurrent map r/w panic

    dani-docker committed Jan 24, 2018
    Signed-off-by: Dani Louca <dani.louca@docker.com>
Commits on Jan 5, 2018
  1. Merge pull request #2828 from dani-docker/esc-308

    nishanttotla committed Jan 5, 2018
    Avoid false positive errors if container networkID is not set
Commits on Jan 4, 2018
  1. Merge pull request #2826 from dani-docker/orca-7577

    nishanttotla committed Jan 4, 2018
    Address concurrency issue
Commits on Jan 3, 2018
  1. Address race condition in RefreshContainers

    dani-docker committed Dec 19, 2017
    Signed-off-by: Dani Louca <dani.louca@docker.com>
  2. Avoid false positive errors if container networkID is not set

    dani-docker committed Dec 20, 2017
    Signed-off-by: Dani Louca <dani.louca@docker.com>