Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #5010 from shykes/cli-tests | unclejack | 2014-04-08 | 4 | -59/+49 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Convert a legacy integration test to a clean v2 CLI integration test. | Solomon Hykes | 2014-04-07 | 4 | -59/+49 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5057 from crosbymichael/refactor-runtime-create | unclejack | 2014-04-07 | 2 | -80/+133 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Clean runtime create and make it simple | Michael Crosby | 2014-04-07 | 1 | -53/+103 | |
| * | | | | | | | Move history to separate file | Michael Crosby | 2014-04-07 | 2 | -27/+30 | |
* | | | | | | | | Merge pull request #4764 from SvenDowideit/use-docker-tgz | James Turnbull | 2014-04-07 | 2 | -5/+9 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | OSX mktemp is different - hopfully this will now work on HP/UX >:} | Sven Dowideit | 2014-03-31 | 1 | -1/+1 | |
| * | | | | | | | mention the tgz - other people might like to know | Sven Dowideit | 2014-03-19 | 1 | -0/+3 | |
| * | | | | | | | use this horrible complex bit of shell to make sure that curl doesn't hand th... | Sven Dowideit | 2014-03-19 | 1 | -5/+6 | |
* | | | | | | | | Merge pull request #5040 from crosbymichael/remove-context-from-config | Victor Vieux | 2014-04-07 | 3 | -21/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove driver wide mount label for dm | Michael Crosby | 2014-04-03 | 1 | -7/+5 | |
| * | | | | | | | | Remove runtime options from config | Michael Crosby | 2014-04-03 | 2 | -14/+2 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5039 from kzys/freebsd-timestamp | Victor Vieux | 2014-04-07 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Don't assume the file system has sub-second precision timestamp | Kato Kazuyoshi | 2014-04-05 | 1 | -4/+4 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #5038 from kzys/remove-archive-stat | unclejack | 2014-04-07 | 1 | -21/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove archive/stat_unsupported.go because it is not used | Kato Kazuyoshi | 2014-04-05 | 1 | -21/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #5051 from SvenDowideit/build-rm-help | unclejack | 2014-04-07 | 3 | -3/+10 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | intermediate image layers are used for more than the build | Sven Dowideit | 2014-04-07 | 3 | -3/+10 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4799 from tianon/no-more-inotifywait | Sven Dowideit | 2014-04-06 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove the inotifywait hack from our upstart host-integration example that is... | Tianon Gravi | 2014-03-20 | 1 | -5/+0 | |
* | | | | | | | Merge pull request #5031 from crosbymichael/revert-env | Victor Vieux | 2014-04-04 | 4 | -21/+21 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "remove hack in version" | Michael Crosby | 2014-04-04 | 1 | -1/+1 | |
| * | | | | | | | Use setjson hack again for version | Michael Crosby | 2014-04-04 | 1 | -1/+1 | |
| * | | | | | | | Revert "engine: fix engine.Env.Encode() to stop auto-guessing types." | Michael Crosby | 2014-04-04 | 2 | -19/+19 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #5027 from unclejack/cli_integration_add_docker_options | unclejack | 2014-04-04 | 2 | -3/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | cli integration: fix wait race | unclejack | 2014-04-04 | 1 | -1/+1 | |
| * | | | | | | | cli integration: allow driver selection via vars | unclejack | 2014-04-04 | 2 | -2/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5008 from unclejack/sync_cli_integration_ops | Victor Vieux | 2014-04-04 | 10 | -17/+17 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | cli integration: sync container & image deletion | unclejack | 2014-04-04 | 10 | -17/+17 | |
* | | | | | | | Merge pull request #4996 from rajatpandit/patch-2 | Sven Dowideit | 2014-04-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update nodejs_web_app.rst | Rajat Pandit | 2014-04-03 | 1 | -1/+1 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4995 from rajatpandit/patch-1 | Sven Dowideit | 2014-04-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Update nodejs_web_app.rst | Rajat Pandit | 2014-04-03 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #4968 from tianon/enhanced-check-config | unclejack | 2014-04-04 | 1 | -36/+80 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update contrib/check-config.sh cgroupfs check to allow for something like '..... | Tianon Gravi | 2014-04-03 | 1 | -1/+1 | |
| * | | | | | | Update contrib/check-config.sh to use zcat and grep if zgrep isn't available | Tianon Gravi | 2014-04-03 | 1 | -2/+7 | |
| * | | | | | | Add more color and cgroupfs hierarchy verification to check-config.sh | Tianon Gravi | 2014-04-02 | 1 | -36/+75 | |
* | | | | | | | Merge pull request #5002 from crosbymichael/rhatdan-selinux | unclejack | 2014-04-04 | 5 | -32/+21 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fix lxc label handleing | Michael Crosby | 2014-04-02 | 3 | -28/+17 | |
| * | | | | | | Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux | Michael Crosby | 2014-04-02 | 3 | -5/+5 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix SELinux issue with missing Contexts in lxc execdriver | Dan Walsh | 2014-04-03 | 2 | -5/+4 | |
| | * | | | | | | In certain cases, setting the process label will not happen. | Dan Walsh | 2014-04-03 | 3 | -0/+9 | |
| | * | | | | | | Remove hard coding of SELinux labels on systems without proper selinux policy. | Dan Walsh | 2014-04-03 | 1 | -5/+7 | |
* | | | | | | | | Merge pull request #5005 from shykes/deprecate-insert | Michael Crosby | 2014-04-03 | 5 | -29/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Deprecate 'docker insert' | Solomon Hykes | 2014-04-03 | 5 | -29/+7 | |
* | | | | | | | | | Merge pull request #5006 from vieux/remove_dirty_hack | Victor Vieux | 2014-04-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove hack in version | Victor Vieux | 2014-04-04 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5004 from shykes/api-unit-tests | Victor Vieux | 2014-04-03 | 4 | -97/+147 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | api/server: convert TestGetInfo from an integration test to a unit test. | Solomon Hykes | 2014-04-04 | 2 | -41/+67 | |
| * | | | | | | | | | engine: fix engine.Env.Encode() to stop auto-guessing types. | Solomon Hykes | 2014-04-03 | 2 | -19/+19 |