4 Commits

Author	SHA1	Message	Date
Andrea Luzzardi	e52aa72e3a	service ps: Truncate Task IDs ... - Refactored to move resolution code into the idresolver - Made `ps` output more bearable by shortening service IDs in task names Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com> Upstream-commit: d296f7a391b54cc5a0b0a80a9d735e7e47a96c86 Component: engine	2016-11-08 16:17:15 -08:00
Ce Gao	0df16199a0	fixes #27643 ... Signed-off-by: Ce Gao <ce.gao@outlook.com> Upstream-commit: 9efa472bd1cfe1274248612c952937334ea3e252 Component: engine	2016-10-28 08:02:57 +08:00
Yong Tang	361ed59824	Fix partial/full filter issue in service tasks --filter ... This fix tries to address the issue related to 24108 and 24790, and also the case from 24620#issuecomment-233715656 The reason for the failure case in the above mentioned issues is that currently Task names are actually indexed by Service Name (`e.ServiceAnnotations.Name`) To fix it, a pull request in swarmkit (swarmkit/pull/1193) has been opened separately. This fix adds the integration tests for the above mentioned issues. Swarmkit revendoring is needed to completely fix the issues. This fix fixes 24108. This fix fixes 24790. This fix is related to 24620. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: f676fc93c3791f72938a6be9c7517ac620c02d1c Component: engine	2016-09-26 16:01:20 -07:00
Daniel Nephin	d8acc366ce	Move api/client -> cli/command ... Using gomvpkg -from github.com/docker/docker/api/client -to github.com/docker/docker/cli/command -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}' Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd Component: engine	2016-09-08 15:46:29 -04:00