summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #5010 from shykes/cli-testsunclejack2014-04-084-59/+49
|\ \ \ \ \ \ \
| * | | | | | | Convert a legacy integration test to a clean v2 CLI integration test.Solomon Hykes2014-04-074-59/+49
|/ / / / / / /
* | | | | | | Merge pull request #5057 from crosbymichael/refactor-runtime-createunclejack2014-04-072-80/+133
|\ \ \ \ \ \ \
| * | | | | | | Clean runtime create and make it simpleMichael Crosby2014-04-071-53/+103
| * | | | | | | Move history to separate fileMichael Crosby2014-04-072-27/+30
* | | | | | | | Merge pull request #4764 from SvenDowideit/use-docker-tgzJames Turnbull2014-04-072-5/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | OSX mktemp is different - hopfully this will now work on HP/UX >:}Sven Dowideit2014-03-311-1/+1
| * | | | | | | mention the tgz - other people might like to knowSven Dowideit2014-03-191-0/+3
| * | | | | | | use this horrible complex bit of shell to make sure that curl doesn't hand th...Sven Dowideit2014-03-191-5/+6
* | | | | | | | Merge pull request #5040 from crosbymichael/remove-context-from-configVictor Vieux2014-04-073-21/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove driver wide mount label for dmMichael Crosby2014-04-031-7/+5
| * | | | | | | | Remove runtime options from configMichael Crosby2014-04-032-14/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #5039 from kzys/freebsd-timestampVictor Vieux2014-04-071-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't assume the file system has sub-second precision timestampKato Kazuyoshi2014-04-051-4/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #5038 from kzys/remove-archive-statunclejack2014-04-071-21/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove archive/stat_unsupported.go because it is not usedKato Kazuyoshi2014-04-051-21/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #5051 from SvenDowideit/build-rm-helpunclejack2014-04-073-3/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | intermediate image layers are used for more than the buildSven Dowideit2014-04-073-3/+10
|/ / / / / / /
* | | | | | | Merge pull request #4799 from tianon/no-more-inotifywaitSven Dowideit2014-04-061-5/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove the inotifywait hack from our upstart host-integration example that is...Tianon Gravi2014-03-201-5/+0
* | | | | | | Merge pull request #5031 from crosbymichael/revert-envVictor Vieux2014-04-044-21/+21
|\ \ \ \ \ \ \
| * | | | | | | Revert "remove hack in version"Michael Crosby2014-04-041-1/+1
| * | | | | | | Use setjson hack again for versionMichael Crosby2014-04-041-1/+1
| * | | | | | | Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."Michael Crosby2014-04-042-19/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #5027 from unclejack/cli_integration_add_docker_optionsunclejack2014-04-042-3/+6
|\ \ \ \ \ \ \
| * | | | | | | cli integration: fix wait raceunclejack2014-04-041-1/+1
| * | | | | | | cli integration: allow driver selection via varsunclejack2014-04-042-2/+5
| |/ / / / / /
* | | | | | | Merge pull request #5008 from unclejack/sync_cli_integration_opsVictor Vieux2014-04-0410-17/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | cli integration: sync container & image deletionunclejack2014-04-0410-17/+17
* | | | | | | Merge pull request #4996 from rajatpandit/patch-2Sven Dowideit2014-04-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update nodejs_web_app.rstRajat Pandit2014-04-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4995 from rajatpandit/patch-1Sven Dowideit2014-04-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update nodejs_web_app.rstRajat Pandit2014-04-031-1/+1
| |/ / / / /
* | | | | | Merge pull request #4968 from tianon/enhanced-check-configunclejack2014-04-041-36/+80
|\ \ \ \ \ \
| * | | | | | Update contrib/check-config.sh cgroupfs check to allow for something like '.....Tianon Gravi2014-04-031-1/+1
| * | | | | | Update contrib/check-config.sh to use zcat and grep if zgrep isn't availableTianon Gravi2014-04-031-2/+7
| * | | | | | Add more color and cgroupfs hierarchy verification to check-config.shTianon Gravi2014-04-021-36/+75
* | | | | | | Merge pull request #5002 from crosbymichael/rhatdan-selinuxunclejack2014-04-045-32/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix lxc label handleingMichael Crosby2014-04-023-28/+17
| * | | | | | Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinuxMichael Crosby2014-04-023-5/+5
| |\ \ \ \ \ \
| | * | | | | | Fix SELinux issue with missing Contexts in lxc execdriverDan Walsh2014-04-032-5/+4
| | * | | | | | In certain cases, setting the process label will not happen.Dan Walsh2014-04-033-0/+9
| | * | | | | | Remove hard coding of SELinux labels on systems without proper selinux policy.Dan Walsh2014-04-031-5/+7
* | | | | | | | Merge pull request #5005 from shykes/deprecate-insertMichael Crosby2014-04-035-29/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecate 'docker insert'Solomon Hykes2014-04-035-29/+7
* | | | | | | | | Merge pull request #5006 from vieux/remove_dirty_hackVictor Vieux2014-04-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove hack in versionVictor Vieux2014-04-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5004 from shykes/api-unit-testsVictor Vieux2014-04-034-97/+147
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | api/server: convert TestGetInfo from an integration test to a unit test.Solomon Hykes2014-04-042-41/+67
| * | | | | | | | | engine: fix engine.Env.Encode() to stop auto-guessing types.Solomon Hykes2014-04-032-19/+19