Daniel Nephin 6bc7bc19df Fix some bad merges ... Signed-off-by: Daniel Nephin <dnephin@docker.com>		2017-01-25 16:43:02 -05:00
..
cmd.go	Move docker stack out of experimental	2016-11-21 14:47:24 -08:00
common.go	Move pkg to cli/compose/convert	2017-01-25 16:02:09 -05:00
deploy.go	Replace vendor of aanand/compose-file with a local copy.	2017-01-25 16:04:05 -05:00
deploy_bundlefile.go	Move pkg to cli/compose/convert	2017-01-25 16:02:09 -05:00
list.go	Move pkg to cli/compose/convert	2017-01-25 16:02:09 -05:00
opts.go	Add a short flag for docker stack deploy	2016-11-28 11:22:59 -08:00
ps.go	Move ConvertService to composetransform package.	2017-01-25 15:58:07 -05:00
remove.go	stack deploy: handle external network when deploying	2016-11-30 14:10:29 -08:00
services.go	Move ConvertService to composetransform package.	2017-01-25 15:58:07 -05:00