17 Commits

Author	SHA1	Message	Date
Daniel Nephin	f47431d591	Resolves #927 - fix merging command line environment with a list in the config ... Signed-off-by: Daniel Nephin <dnephin@gmail.com>	2015-03-02 10:23:43 -05:00
Aanand Prasad	db3b4731cd	Merge pull request #1044 from usrenmae/py3-compat ... Move several steps closer to python3 compatibility	2015-03-02 12:08:39 +00:00
Aanand Prasad	f89f9e3190	Merge pull request #1007 from KingsleyKelly/force ... Add -f flag as option on rm.	2015-03-02 11:26:28 +00:00
Igor Ch	f1fc1d7a16	Move several steps closer to python3 compatibility ... Signed-off-by: Igor Ch <usrenmae@gmail.com>	2015-02-28 23:26:20 +02:00
KingsleyKelly	fa195bc829	Add -f flag as option on rm. ... Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>	2015-02-27 07:24:43 +00:00
Aanand Prasad	4ac02bfca6	Ship 1.1.0 ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-02-25 18:16:44 +00:00
Ben Firshman	b2425c1f1e	Log "creating container" when scaling ... If an image needs pulling, it just looks like it's hanging. Signed-off-by: Ben Firshman <ben@firshman.co.uk>	2015-02-24 13:39:38 +00:00
Aanand Prasad	c39a0b0a2d	Update pep8, fix errors and freeze requirements-dev.txt ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-02-11 19:00:13 +00:00
Aanand Prasad	deb2de3c07	Ship 1.1.0-rc2 ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-29 18:00:10 -05:00
Aanand Prasad	bc1f6c97d8	Merge pull request #898 from aanand/support-fig-yml ... Support fig.yml	2015-01-29 13:47:49 -05:00
Aanand Prasad	7c087f1c07	Support fig.y(a)ml and show a deprecation warning ... Closes #864 Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-29 13:14:44 -05:00
Aanand Prasad	de07e0471e	Show a nicer error when the env file doesn't exist ... Closes #865 Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-28 16:20:01 -05:00
Aanand Prasad	dfc6206d0d	Extract get_env_files() ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-28 16:18:02 -05:00
Aanand Prasad	43fdae8bc6	Ship 1.1.0-rc1 ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-20 22:42:59 +00:00
Aanand Prasad	16d6018419	Fix typos ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-20 21:28:49 +00:00
Aanand Prasad	620e29b63f	Rename binary to docker-compose and config file to docker-compose.yml ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-20 21:00:23 +00:00
Aanand Prasad	2af7693e64	WIP: rename Fig to Compose ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-20 21:00:23 +00:00