29ceef6d93
Merge pull request #1706 from aanand/bump-1.3.3
...
Bump 1.3.3
2015-07-16 11:40:20 +01:00
8cff440800
Bump 1.3.3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-16 11:21:01 +01:00
e5f6ae767d
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
(cherry picked from commit c7dccccd1f
2015-07-16 11:19:21 +01:00
cd44179305
Merge pull request #1705 from aanand/fix-labels-null
...
Handle case where /containers/json returns "Labels": null
(cherry picked from commit 7b9664be8e
2015-07-15 17:33:08 +01:00
c3c5b354b8
Merge pull request #1690 from aanand/bump-1.3.2
...
Bump 1.3.2
2015-07-14 18:04:22 +01:00
95cf195dbd
Bump 1.3.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 17:40:43 +01:00
a80afd67ab
Merge pull request #1688 from aanand/use-docker-py-1.3.0
...
Use docker-py 1.3.0
(cherry picked from commit 1e71eebc74
2015-07-14 17:29:25 +01:00
4bc4d273ac
Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers
...
Show an error on 'run' when there are legacy one-off containers
(cherry picked from commit 81707ef1ad
2015-07-14 17:29:12 +01:00
4911c77134
Merge pull request #1489 from dnephin/faster_integration_tests
...
Faster integration tests
(cherry picked from commit 5231288b4e
2015-07-14 17:28:54 +01:00
c1b9a76a54
Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image
...
Fix smart recreate when 'image' is changed to something nonexistent
(cherry picked from commit 2bc10db545
2015-07-14 17:25:33 +01:00
c31e25af72
Merge pull request #1642 from aanand/fix-1573
...
Fix bug where duplicate container is leftover after 'up' fails
(cherry picked from commit f42fd6a3ad
2015-07-14 17:25:03 +01:00
c8295d36cc
Merge pull request #1644 from aanand/fix-rm-bug
...
Stop 'rm' and 'ps' listing services not defined in the current file
(cherry picked from commit d85688892c
2015-07-14 17:24:15 +01:00
b12c29479e
Merge pull request #1521 from dano/validate-service-names
...
Validate that service names passed to Project.containers aren't bogus.
(cherry picked from commit bc14c473c9
2015-07-14 17:24:15 +01:00
cd47829f3d
Merge pull request #1588 from aanand/bump-1.3.1
...
Bump 1.3.1
2015-06-22 08:01:13 -07:00
4d4ef4e0b3
Bump 1.3.1
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-21 17:32:36 -07:00
882ef2ccd8
Merge pull request #1578 from aanand/fix-migrate-help
...
Fix 'docker-compose help migrate-to-labels'
(cherry picked from commit c8751980f9
2015-06-21 17:28:18 -07:00
d6cd76c3c1
Merge pull request #1570 from aanand/fix-build-pull
...
Explicitly set pull=False when building
(cherry picked from commit 4f83a18912
2015-06-21 17:28:09 -07:00
bd0be2cdc7
Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified
...
Don't set network mode when none is specified
(cherry picked from commit 911cd60360
2015-06-21 17:27:59 -07:00
a8d7ebd987
Merge pull request #1461 from aanand/bump-1.3.0
...
Bump 1.3.0
2015-06-18 11:41:40 -07:00
00f61196a4
Bump 1.3.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 11:25:10 -07:00
c21d6706b6
Merge pull request #1565 from aanand/use-docker-1.7.0
...
Use docker 1.7.0 and docker-py 1.2.3
(cherry picked from commit 8ffeaf2a54
2015-06-18 11:25:10 -07:00
c3c5d91c47
Merge pull request #1563 from moxiegirl/hugo-test-fixes
...
Hugo final 1.7 Documentation PR -- please read carefully
(cherry picked from commit 4e73e86d94
2015-06-18 11:25:10 -07:00
7fa4cd1214
Merge pull request #1552 from aanand/add-upgrade-instructions
...
Add upgrading instructions to install docs
(cherry picked from commit bc7161b475
2015-06-16 16:29:18 -07:00
f353d9fbc0
Merge pull request #1406 from vdemeester/667-compose-port-scale
...
Fixing docker-compose port with scale (#667 )
(cherry picked from commit 5b2a0cc73d
2015-06-15 11:22:08 -07:00
09018855ce
Merge pull request #1550 from aanand/update-docker-py
...
Update setup.py with new docker-py minimum
(cherry picked from commit b3b44b8e4c
2015-06-15 11:22:08 -07:00
719954b02f
Merge pull request #1545 from moxiegirl/test-tooling
...
Updated for new documentation tooling
(cherry picked from commit aaccd12d3d
2015-06-15 11:22:08 -07:00
67bc3fabe4
Merge pull request #1544 from aanand/fix-volume-deduping
...
Fix volume binds de-duplication
(cherry picked from commit 77e594dc94
2015-06-15 11:22:08 -07:00
e724a346c7
Merge pull request #1526 from aanand/remove-start-or-create-containers
...
Remove Service.start_or_create_containers()
(cherry picked from commit 38a11c4c28
2015-06-15 11:22:08 -07:00
87b4545b44
Merge pull request #1508 from thaJeztah/update-dockerproject-links
...
Update dockerproject.com links
(cherry picked from commit 417e6ce0c9
2015-06-15 11:22:07 -07:00
58a7844129
Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore
...
Make it possible to run tests remotely
(cherry picked from commit c8e096e089
2015-06-15 11:22:07 -07:00
4353f7b9f9
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
(cherry picked from commit d64bf88e26
2015-06-15 11:22:07 -07:00
8f8693e13e
Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop
...
Change kill SIGINT test to use SIGSTOP
(cherry picked from commit a15f996744
2015-06-15 11:22:07 -07:00
363a6563c7
Merge pull request #1537 from aanand/reorder-service-utils
...
Reorder service.py utility methods
(cherry picked from commit e3525d64b5
2015-06-15 11:22:07 -07:00
59d6af73fa
Merge pull request #1539 from bfirsh/add-image-affinity-to-test
...
Add image affinity to test script
(cherry picked from commit 4c2112dbfd
2015-06-15 11:22:07 -07:00
cd7f67018e
Merge pull request #1466 from noironetworks/changing-scale-to-warning
...
Modified scale awareness from exception to warning
(cherry picked from commit 7d2a89427c
2015-06-15 11:22:07 -07:00
b7e8770c4f
Merge pull request #1538 from thieman/tnt-serivce-misspelled
...
Correct misspelling of "Service" in an error message
(cherry picked from commit bd246fb011
2015-06-15 11:22:07 -07:00
ad4cc5d6df
Merge pull request #1497 from aanand/use-1.7-rc1
...
Run tests against Docker 1.7 RC2
(cherry picked from commit 0e9ccd36f3
2015-06-15 11:22:06 -07:00
ca14ed68f7
Merge pull request #1533 from edmorley/update-b2d-shellinit-example
...
Docs: Update boot2docker shellinit example to use 'eval'
(cherry picked from commit 17e03b29f9
2015-06-15 11:22:06 -07:00
71514cb380
Merge pull request #1531 from aanand/test-crash-resilience
...
Test that data volumes now survive a crash when recreating
(cherry picked from commit 87c30ae6e4
2015-06-15 11:22:06 -07:00
8212f1bd45
Merge pull request #1529 from aanand/update-dockerpty
...
Update dockerpty to 0.3.4
(cherry picked from commit 95b2eaac04
2015-06-09 18:24:14 -04:00
dca3bbdea3
Merge pull request #1527 from aanand/remove-logging-on-run-rm
...
Remove logging on run --rm
(cherry picked from commit 5578ccbb01
2015-06-09 14:39:53 -04:00
8ed7dfef6f
Merge pull request #1525 from aanand/fix-duplicate-logging
...
Fix duplicate logging on up/run
(cherry picked from commit e2b790f732
2015-06-09 14:39:52 -04:00
631f5be02f
Merge pull request #1481 from albers/completion-smart-recreate
...
Support --x-smart-recreate in bash completion
(cherry picked from commit 9a0bb325f2
2015-06-09 14:39:52 -04:00
4f4ea2a402
Merge pull request #1325 from sdurrheimer/master
...
Zsh completion for docker-compose
(cherry picked from commit b638728d6c
2015-06-09 14:39:50 -04:00
5a5bffebd1
Merge pull request #1464 from twhiteman/bug1461
...
Possible division by zero error when pulling an image - fixes #1463
(cherry picked from commit d0e87929a1
2015-06-09 14:39:05 -04:00
8749bc0844
Build Python 2.7.9 in Docker image
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-02 11:39:17 +01:00
f3d0c63db2
Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-02 11:39:17 +01:00
93a846db31
Report Python and OpenSSL versions in --version output
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/cli/utils.py
2015-06-02 11:39:17 +01:00
686c25d50f
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-27 17:52:23 +01:00
ef6555f084
Merge branch 'release' into bump-1.3.0
2015-05-26 17:45:28 +01:00
Aanand Prasad