Commit graph

Select branches

Hide pull requests

bump-1.11.1

bump-1.11.2

cache_from

docs

fig-stable

johndmulhausen-patch-1

master

release

update-openssl-mac

0.0.1

0.0.2

0.1.0

0.1.1

0.1.2

0.1.3

0.1.4

0.2.0

0.2.1

0.2.2

0.3.0

0.3.1

0.3.2

0.4.0

0.4.1

0.4.2

0.5.0

0.5.1

0.5.2

1.0.0

1.0.1

1.1.0

1.1.0-rc1

1.1.0-rc2

1.10.0

1.10.0-rc1

1.10.0-rc2

1.10.1

1.11.0

1.11.0-rc1

1.11.1

1.2.0

1.2.0rc1

1.2.0rc2

1.2.0rc3

1.2.0rc4

1.3.0

1.3.0rc1

1.3.0rc2

1.3.0rc3

1.3.1

1.3.2

1.3.3

1.4.0

1.4.0rc1

1.4.0rc2

1.4.0rc3

1.4.1

1.4.2

1.5.0

1.5.0rc1

1.5.0rc2

1.5.0rc3

1.5.1

1.5.2

1.6.0

1.6.0-rc1

1.6.0-rc2

1.6.1

1.6.2

1.7.0

1.7.0-rc1

1.7.0-rc2

1.7.1

1.8.0

1.8.0-rc1

1.8.0-rc2

1.8.1

1.9.0

1.9.0-rc1

1.9.0-rc2

1.9.0-rc3

1.9.0-rc4

docs-v1.7.1-2016-05-31

docs-v1.7.1-2016-06-28

docs-v1.7.1-2016-07-20

docs-v1.8.0-2016-08-03

Mono Color

• 8f8693e13e Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop Aanand Prasad 2015-05-29 12:38:40 +01:00
• 363a6563c7 Merge pull request #1537 from aanand/reorder-service-utils Ben Firshman 2015-06-11 21:55:33 +01:00
• 59d6af73fa Merge pull request #1539 from bfirsh/add-image-affinity-to-test Aanand Prasad 2015-06-12 11:56:02 -04:00
• cd7f67018e Merge pull request #1466 from noironetworks/changing-scale-to-warning Aanand Prasad 2015-06-04 16:21:01 +01:00
• b7e8770c4f Merge pull request #1538 from thieman/tnt-serivce-misspelled Ben Firshman 2015-06-11 21:54:53 +01:00
• ad4cc5d6df Merge pull request #1497 from aanand/use-1.7-rc1 Aanand Prasad 2015-06-10 17:19:24 -04:00
• ca14ed68f7 Merge pull request #1533 from edmorley/update-b2d-shellinit-example Aanand Prasad 2015-06-10 13:03:55 -04:00
• 71514cb380 Merge pull request #1531 from aanand/test-crash-resilience Daniel Nephin 2015-06-09 22:22:56 -04:00
• 5b2a0cc73d Merge pull request #1406 from vdemeester/667-compose-port-scale Aanand Prasad 2015-06-15 10:58:44 -07:00
• acd8dce595 Add upgrading instructions to install docs Aanand Prasad 2015-06-15 10:46:01 -07:00
• b3b44b8e4c Merge pull request #1550 from aanand/update-docker-py Daniel Nephin 2015-06-15 13:43:57 -04:00
• aaccd12d3d Merge pull request #1545 from moxiegirl/test-tooling Aanand Prasad 2015-06-15 10:36:37 -07:00
• b4c49ed805 Use Docker 1.7 RC3 Aanand Prasad 2015-06-15 10:25:58 -07:00
• 4e108e377e Update setup.py with new docker-py minimum Aanand Prasad 2015-06-15 10:18:15 -07:00
• 5231288b4e Merge pull request #1489 from dnephin/faster_integration_tests Aanand Prasad 2015-06-15 10:04:45 -07:00
• e40fc02561 Testing with documentation tooling Updating with changes Updating for Hugo Adding a README' moving index.md compose-overview.md in links changing overview Updating image to pull Mary Anthony 2015-06-07 13:59:58 -07:00
• 06db577105 Move converge() to a test module, and use a short timeout for tests. Daniel Nephin 2015-06-14 17:11:29 -04:00
• c24d5380e6 Extend up -t to pass timeout to stop running containers Travis Thieman 2015-05-28 09:28:02 -04:00
• 60351a8e07 Speed up integration test and make cleanup easier by using labels Daniel Nephin 2015-05-30 16:17:21 -04:00
• d827809ffb Use labels to filter containers. Daniel Nephin 2015-05-30 14:52:10 -04:00
• 77e594dc94 Merge pull request #1544 from aanand/fix-volume-deduping Daniel Nephin 2015-06-14 13:28:14 -04:00
• 08bc4b830b Fix volume binds de-duplication Aanand Prasad 2015-06-12 13:51:55 -04:00
• 4c2112dbfd Merge pull request #1539 from bfirsh/add-image-affinity-to-test Aanand Prasad 2015-06-12 11:56:02 -04:00
• ac222140e7 Add image affinity to test script Ben Firshman 2015-06-11 15:58:07 -07:00
• e3525d64b5 Merge pull request #1537 from aanand/reorder-service-utils Ben Firshman 2015-06-11 21:55:33 +01:00
• bd246fb011 Merge pull request #1538 from thieman/tnt-serivce-misspelled Ben Firshman 2015-06-11 21:54:53 +01:00
• f31d4c8a93 Correct misspelling of "Service" in an error message Travis Thieman 2015-06-11 14:03:08 -04:00
• 7995fc2ed2 Reorder service.py utility methods Aanand Prasad 2015-06-11 11:41:01 -04:00
• a5fd91c705 Fixing docker-compose port with scale (#667) Vincent Demeester 2015-05-12 13:44:52 +02:00
• 0e9ccd36f3 Merge pull request #1497 from aanand/use-1.7-rc1 Aanand Prasad 2015-06-10 17:19:24 -04:00
• 4fd5d58076 Test against Docker 1.7.0 RC2 Aanand Prasad 2015-06-02 14:28:21 +01:00
• 17e03b29f9 Merge pull request #1533 from edmorley/update-b2d-shellinit-example Aanand Prasad 2015-06-10 13:03:55 -04:00
• e3ba302627 Docs: Update boot2docker shellinit example to use 'eval' Ed Morley 2015-06-10 14:37:12 +01:00
• 87c30ae6e4 Merge pull request #1531 from aanand/test-crash-resilience Daniel Nephin 2015-06-09 22:22:56 -04:00
• 1e963618b8 Bump 1.3.0rc2 1.3.0rc2 Aanand Prasad 2015-05-26 12:43:23 +01:00
• 8212f1bd45 Merge pull request #1529 from aanand/update-dockerpty Daniel Nephin 2015-06-09 18:21:14 -04:00
• 95b2eaac04 Merge pull request #1529 from aanand/update-dockerpty Daniel Nephin 2015-06-09 18:21:14 -04:00
• dca3bbdea3 Merge pull request #1527 from aanand/remove-logging-on-run-rm Daniel Nephin 2015-06-08 16:21:02 -04:00
• 8ed7dfef6f Merge pull request #1525 from aanand/fix-duplicate-logging Daniel Nephin 2015-06-08 12:48:46 -04:00
• 631f5be02f Merge pull request #1481 from albers/completion-smart-recreate Daniel Nephin 2015-05-30 09:01:39 -05:00
• 4f4ea2a402 Merge pull request #1325 from sdurrheimer/master Ben Firshman 2015-05-29 14:45:21 +01:00
• 5a5bffebd1 Merge pull request #1464 from twhiteman/bug1461 Aanand Prasad 2015-05-27 12:49:58 +01:00
• ff151c8ea0 Test that data volumes now survive a crash when recreating Aanand Prasad 2015-06-09 12:54:59 -04:00
• 66af37b135 Merge pull request #1474 from aanand/fix-ssl Aanand Prasad 2015-06-09 11:56:27 -04:00
• c59c9dd951 Add integration test for service name verification Dan O'Reilly 2015-06-08 17:04:42 -04:00
• ce880af821 Update dockerpty to 0.3.4 Aanand Prasad 2015-06-08 16:56:14 -04:00
• 5578ccbb01 Merge pull request #1527 from aanand/remove-logging-on-run-rm Daniel Nephin 2015-06-08 16:21:02 -04:00
• 38a11c4c28 Merge pull request #1526 from aanand/remove-start-or-create-containers Daniel Nephin 2015-06-08 12:49:32 -04:00
• e2b790f732 Merge pull request #1525 from aanand/fix-duplicate-logging Daniel Nephin 2015-06-08 12:48:46 -04:00
• b6a7db787f Remove logging on run --rm Aanand Prasad 2015-06-08 11:16:00 -04:00
• db2d02dc0b Remove Service.start_or_create_containers() Aanand Prasad 2015-06-08 10:58:11 -04:00
• f59b43ac27 Fix duplicate logging on up/run Aanand Prasad 2015-06-08 10:51:46 -04:00
• 2527ef8055 Validate that service names passed to Project.containers aren't bogus. dano 2015-06-06 15:12:13 -04:00
• 417e6ce0c9 Merge pull request #1508 from thaJeztah/update-dockerproject-links Daniel Nephin 2015-06-04 11:18:23 -05:00
• 7d2a89427c Merge pull request #1466 from noironetworks/changing-scale-to-warning Aanand Prasad 2015-06-04 16:21:01 +01:00
• 036a4c4258 Merge pull request #1507 from albers/completion-version Aanand Prasad 2015-06-04 15:46:50 +01:00
• cfcc12692f Update dockerproject.com links Sebastiaan van Stijn 2015-06-03 22:59:12 +02:00
• be92b79b42 Support version command in Bash completion Harald Albers 2015-06-03 13:25:26 -07:00
• 417e8d80c3 Merge pull request #1499 from sdurrheimer/master Aanand Prasad 2015-06-02 15:05:46 +01:00
• 8749bc0844 Build Python 2.7.9 in Docker image Aanand Prasad 2015-06-01 14:01:30 +01:00
• f3d0c63db2 Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary Aanand Prasad 2015-05-28 17:24:03 +01:00
• 93a846db31 Report Python and OpenSSL versions in --version output Aanand Prasad 2015-05-28 17:18:04 +01:00
• 77409737ce Support version command in zsh completion Steve Durrheimer 2015-06-02 12:38:23 +02:00
• 2594282082 Build Python 2.7.9 in Docker image Aanand Prasad 2015-06-01 14:01:30 +01:00
• 8ad11c0bc8 Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary Aanand Prasad 2015-05-28 17:24:03 +01:00
• c571bb485d Report Python and OpenSSL versions in --version output Aanand Prasad 2015-05-28 17:18:04 +01:00
• 8eb65ed946 Merge pull request #878 from funkyfuture/versioncmd Aanand Prasad 2015-06-01 13:36:11 +01:00
• 9a0bb325f2 Merge pull request #1481 from albers/completion-smart-recreate Daniel Nephin 2015-05-30 09:01:39 -05:00
• d64bf88e26 Merge pull request #1475 from fordhurley/patch-1 Daniel Nephin 2015-05-30 08:43:48 -05:00
• c8e096e089 Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore Aanand Prasad 2015-05-29 17:12:57 +01:00
• b638728d6c Merge pull request #1325 from sdurrheimer/master Ben Firshman 2015-05-29 14:45:21 +01:00
• 1d5526c71d Support --x-smart-recreate and -v in zsh completion Steve Durrheimer 2015-05-29 14:23:37 +02:00
• bc8d5923e7 Zsh completion for docker-compose Steve Durrheimer 2015-04-22 11:53:02 +02:00
• a6bd1d22a0 Don't mount code in a volume when running tests Ben Firshman 2015-05-29 13:23:42 +01:00
• c128e881c1 Add build and dist to dockerignore Ben Firshman 2015-05-29 13:07:19 +01:00
• a15f996744 Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop Aanand Prasad 2015-05-29 12:38:40 +01:00
• b3c1c9c954 Support --x-smart-recreate and -v in bash completion Harald Albers 2015-05-29 13:17:18 +02:00
• ec437313a7 Change kill SIGINT test to use SIGSTOP Ben Firshman 2015-05-29 11:13:37 +01:00
• 5945db0fa8 Fix markdown formatting for --service-ports example Ford Hurley 2015-05-28 15:44:16 -04:00
• 8574cb67a4 Merge pull request #1471 from aanand/prepare-osx-script Ben Firshman 2015-05-28 13:58:14 +01:00
• ae9d619d86 Add command for Docker-style version information funkyfuture 2015-01-25 00:16:37 +01:00
• 6171d8fb1f Bump 1.3.0rc1 1.3.0rc1 Aanand Prasad 2015-05-26 12:43:23 +01:00
• 686c25d50f Script to prepare OSX build environment Aanand Prasad 2015-05-27 15:13:12 +01:00
• 7d9aa8e0a9 Script to prepare OSX build environment Aanand Prasad 2015-05-27 15:13:12 +01:00
• d0e87929a1 Merge pull request #1464 from twhiteman/bug1461 Aanand Prasad 2015-05-27 12:49:58 +01:00
• ae63d35660 Modified scale awareness from exception to warning André Martins 2015-05-26 23:17:39 +01:00
• b9c502531d Possible division by zero error when pulling an image - fixes #1463 Todd Whiteman 2015-05-26 12:25:52 -07:00
• ef6555f084 Merge branch 'release' into bump-1.3.0 Aanand Prasad 2015-05-26 17:45:28 +01:00
• 1344099e29 Merge pull request #1444 from aanand/migrate-in-dependency-order Aanand Prasad 2015-05-26 17:30:14 +01:00
• 48f3d41947 Merge pull request #1447 from aanand/fix-convergence-when-service-not-created Daniel Nephin 2015-05-26 10:54:28 -05:00
• 7da8e6be3b Migrate containers in dependency order Aanand Prasad 2015-05-21 16:09:06 +01:00
• 4795fd874f Fix regression in docker-compose up Aanand Prasad 2015-05-21 20:03:02 +01:00
• 276fee105b Merge pull request #1459 from bfirsh/update-description Aanand Prasad 2015-05-26 15:57:26 +01:00
• 8af4ae7935 Merge pull request #1441 from aanand/abort-on-legacy-containers Ben Firshman 2015-05-26 15:45:08 +01:00
• 91ceb33d5a Update description of Compose Ben Firshman 2015-05-26 15:41:59 +01:00
• 0b4d9401ee Bail out immediately if there are legacy containers Aanand Prasad 2015-05-21 12:41:36 +01:00
• 889d3636f4 Merge pull request #1440 from aanand/legacy-fixes Daniel Nephin 2015-05-24 12:42:14 -05:00
• b0f945d2da Merge pull request #1432 from albers/completion-migrate_to_labels Daniel Nephin 2015-05-23 18:21:44 -05:00
• 93c529182e Merge pull request #1446 from aanand/fix-create-logging Daniel Nephin 2015-05-21 17:34:54 -05:00
• 412034a023 bash completion for migrate-to-labels Harald Albers 2015-05-20 15:31:10 +02:00