summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "correct comment errors for netlink_linux.go"revert-11495-m3unclejack2015-03-191-2/+2
* Merge pull request #11495 from sunyuan3/m3Doug Davis2015-03-191-2/+2
|\
| * correct comment errors for netlink_linux.gos003188652015-03-191-2/+2
|/
* Merge pull request #11488 from stevvooe/address-digest-deadlockMichael Crosby2015-03-185-5/+91
|\
| * Correctly close pipe after error in tarsum verificationStephen J Day2015-03-185-5/+91
* | Merge pull request #11028 from jstangroome/patch-1James Turnbull2015-03-191-4/+5
|\ \
| * | Correct IP/MAC address generation docsJason Stangroome2015-02-281-4/+5
* | | Merge pull request #11410 from cpuguy83/10191_build_resourcesDoug Davis2015-03-1811-4/+151
|\ \ \ | |_|/ |/| |
| * | Allow setting resource constrains for buildBrian Goff2015-03-1811-4/+151
* | | Merge pull request #11452 from jeffdm/mastermoxiegirl2015-03-182-33/+40
|\ \ \
| * | | Adding Kitematic link to Mac OS X install instructionsJeffrey Morgan2015-03-182-33/+40
* | | | Merge pull request #11328 from jfrazelle/fix-docs-release-scriptJessie Frazelle2015-03-183-1/+167
|\ \ \ \
| * | | | Fix clear cache docs release.Jessica Frazelle2015-03-113-1/+167
* | | | | Merge pull request #11430 from jfrazelle/export_outputflagTibor Vass2015-03-184-10/+102
|\ \ \ \ \
| * | | | | fix TestExportContainerWithOutputAndImportImage on windowsJessica Frazelle2015-03-171-6/+8
| * | | | | Modified `docker export` to allow an --output flagJoseph Kern2015-03-174-10/+100
* | | | | | Merge pull request #11471 from LK4D4/wait_for_copierJessie Frazelle2015-03-184-6/+39
|\ \ \ \ \ \
| * | | | | | Wait for copier finishing it's work before closing loggerAlexander Morozov2015-03-184-6/+39
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #11474 from crosbymichael/null-masked-pathsJessie Frazelle2015-03-181-0/+1
|\ \ \ \ \ \
| * | | | | | Do not mask /proc/kcore in privilegedMichael Crosby2015-03-181-0/+1
| |/ / / / /
* | | | | | Merge pull request #11472 from LK4D4/logger_mutexPhil Estes2015-03-181-2/+11
|\ \ \ \ \ \
| * | | | | | Protect jsonfilelog writes with mutexAlexander Morozov2015-03-181-2/+11
| |/ / / / /
* | | | | | Merge pull request #11271 from dmcgowan/v2-sha256Tibor Vass2015-03-1812-29/+768
|\ \ \ \ \ \
| * | | | | | Support push and pull of sha256Derek McGowan2015-03-173-29/+24
| * | | | | | Vendor distribution/digestDerek McGowan2015-03-179-0/+744
* | | | | | | Merge pull request #11464 from ncdc/fix-duplicate-dangling-imagesJessie Frazelle2015-03-182-16/+62
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix duplicate display of dangling imagesAndy Goldstein2015-03-182-16/+62
* | | | | | | Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144moxiegirl2015-03-183-13/+51
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Clarify behavior of docker cpMary Anthony2015-03-163-13/+51
* | | | | | | Merge pull request #11314 from HammerOfThor/pull_err_printDoug Davis2015-03-181-3/+7
|\ \ \ \ \ \ \
| * | | | | | | print detailed error info for docker pullZhang Wei2015-03-181-3/+7
|/ / / / / / /
* | | | | | | Merge pull request #11450 from crosbymichael/rlimitfixAlexander Morozov2015-03-171-7/+0
|\ \ \ \ \ \ \
| * | | | | | | Don't hardcode default rlimitMichael Crosby2015-03-171-7/+0
* | | | | | | | Merge pull request #11320 from estesp/fix-daemon-startupJessie Frazelle2015-03-174-29/+93
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix daemon shutdown on error after rework of daemon startupPhil Estes2015-03-174-29/+93
* | | | | | | | | Merge pull request #11237 from thaJeztah/docs-remove-temporary-stylesJessie Frazelle2015-03-176-95/+33
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | cleanup: docs: remove temporary inline stylesSebastiaan van Stijn2015-03-176-95/+33
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #11431 from jfrazelle/update-docs-image-on-makeJessie Frazelle2015-03-171-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update docs/base in makefile docs-build.Jessica Frazelle2015-03-161-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #11448 from vishh/port_logPhil Estes2015-03-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_po...Vishnu Kannan2015-03-171-1/+1
* | | | | | | | Merge pull request #11355 from moxiegirl/11023-ubuntu-installJames Turnbull2015-03-172-285/+196
|\ \ \ \ \ \ \ \
| * | | | | | | | # This is a combination of 2 commits.Mary Anthony2015-03-172-285/+196
* | | | | | | | | Merge pull request #11298 from brahmaroutu/gccgo_scriptPhil Estes2015-03-174-1/+79
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Build docker with gccgo, requires host to contain gccgo 5.0Srini Brahmaroutu2015-03-164-1/+79
* | | | | | | | | Merge pull request #11444 from albers/bash-completionJessie Frazelle2015-03-171-99/+230
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Updates to bash completionHarald Albers2015-03-171-99/+230
* | | | | | | | | Merge pull request #11447 from moxiegirl/black-to-back-fixesTibor Vass2015-03-171-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fixing it backMary Anthony2015-03-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882moxiegirl2015-03-178-77/+87
|\ \ \ \ \ \ \ \
View Lorry Controller Status