summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #4016 from shin-/4008-unicode-formatterJoffrey F2016-10-06
|\
| * Handle formatter case where logrecord message is binary containingJoffrey F2016-10-06
* | Merge pull request #3992 from shin-/3701-npipe-windows-defaultJoffrey F2016-10-06
|\ \
| * | Use docker-py's default behavior when no explicit host on WindowsJoffrey F2016-09-28
* | | Merge pull request #4015 from dnephin/fix-inline-defaultsJoffrey F2016-10-06
|\ \ \ | |_|/ |/| |
| * | Support non-alphanumeric default values.Daniel Nephin2016-10-06
|/ /
* | Merge pull request #4010 from londoncalling/add-vnext-infoVictoria Bialas2016-10-05
|\ \
| * | updated README per vnext branch planVictoria Bialas2016-10-05
|/ /
* | Merge pull request #3108 from dnephin/inplace_var_defaultsJoffrey F2016-10-05
|\ \
| * | Support inline default values.Daniel Nephin2016-09-29
| |/
* | Merge pull request #4005 from johndmulhausen/masterJohn Mulhausen2016-10-04
|\ \ | |/ |/|
| * Remove old documentation source, add README on migrationJohn Mulhausen2016-10-04
|/
* Merge pull request #3653 from shin-/3637-link-local-ipsJoffrey F2016-09-22
|\
| * Denormalize function defaults to latest versionJoffrey F2016-09-20
| * Include docker-py link-local fix and improve integration testJoffrey F2016-09-15
| * Add support for link-local IPs in service.networks definitionJoffrey F2016-09-15
* | Merge pull request #3956 from shin-/update_dockerpy_versionDaniel Nephin2016-09-21
|\ \
| * | Bump docker-py dependencyJoffrey F2016-09-16
| |/
* | Merge pull request #3922 from shin-/3897-volumespec_parse_win32Joffrey F2016-09-20
|\ \
| * | Improve volumespec parsing on windows platformsJoffrey F2016-09-20
* | | Merge pull request #3709 from Knetic/groupaddJoffrey F2016-09-19
|\ \ \
| * | | Supported group_addGeorge Lester2016-09-11
| |/ /
* | | Merge pull request #3954 from shin-/windows_tcp_defaultJoffrey F2016-09-16
|\ \ \ | |_|/ |/| |
| * | Force default host on windows to the default TCP host (instead of npipe)Joffrey F2016-09-16
|/ /
* | Merge pull request #3941 from shin-/3888-recover-apierror-logsJoffrey F2016-09-13
|\ \
| * | Catch APIError while printing container logsJoffrey F2016-09-13
| |/
* | Merge pull request #3942 from shin-/3873-syslog-logs-errorJoffrey F2016-09-13
|\ \
| * | Only allow log streaming if logdriver is json-file or journaldJoffrey F2016-09-13
| |/
* | Merge pull request #3943 from aanand/fix-integration-test-on-docker-for-macJoffrey F2016-09-13
|\ \
| * | Fix integration test on Docker for MacAanand Prasad2016-09-13
| |/
* | Merge pull request #3930 from shin-/update_dockerpy_versionDaniel Nephin2016-09-13
|\ \
| * | Update docker-py dependency to latest releaseJoffrey F2016-09-12
| |/
* | Merge pull request #3921 from shin-/3890-pull-servicesDaniel Nephin2016-09-13
|\ \ | |/ |/|
| * Fix command hint in bundle to pull services instead of imagesJoffrey F2016-09-08
* | Merge pull request #3830 from shin-/3534-machine-config-argsJoffrey F2016-09-07
|\|
| * Remove surrounding quotes from TLS paths, if presentJoffrey F2016-08-09
* | Merge pull request #3814 from aanand/disambiguate-swarmBen Firshman2016-09-07
|\ \
| * | Disambiguate 'Swarm' in integration docAanand Prasad2016-08-04
| |/
* | Merge pull request #3799 from aanand/handle-connection-error-on-project-initJoffrey F2016-09-06
|\ \
| * | Handle connection errors on project initializationAanand Prasad2016-08-02
* | | Merge pull request #3865 from SvenDowideit/add-jenkinsfileSven Dowideit2016-08-24
|\ \ \
| * | | Add docs checking JenkinsfileSven Dowideit2016-08-22
|/ / /
* | | Merge pull request #3542 from jfroche/add_swappinessBen Firshman2016-08-16
|\ \ \
| * | | Add support for swappiness constraintJean-François Roche2016-08-16
|/ / /
* | | Merge pull request #3808 from jgsqware/patch-1Joffrey F2016-08-09
|\ \ \ | |_|/ |/| |
| * | Update rm.mdJG²2016-08-05
* | | Merge pull request #3789 from shin-/3788-json-splitter-fixAanand Prasad2016-08-03
|\ \ \ | |/ / |/| |
| * | Catchable error for parse failures in split_bufferJoffrey F2016-08-02
| * | json_splitter: Don't break when buffer contains leading whitespace.Joffrey F2016-07-29
* | | Merge pull request #3797 from aanand/note-about-experimental-buildVictoria2016-08-01
|\ \ \ | |_|/ |/| |