Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Update basic setup instructions"revert-12383-patch-1 | moxiegirl | 2015-04-16 | 1 | -6/+2 |
* | Merge pull request #12383 from jdivock/patch-1 | moxiegirl | 2015-04-16 | 1 | -2/+6 |
|\ | |||||
| * | Update basic setup instructions | Jason Divock | 2015-04-14 | 1 | -2/+6 |
* | | Merge pull request #12452 from moxiegirl/release-versions-set | moxiegirl | 2015-04-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Updating with final version from Stephen | Mary Anthony | 2015-04-16 | 1 | -1/+1 |
* | | | Merge pull request #12411 from sbasyal/patch-2 | moxiegirl | 2015-04-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | The link to issue 407 was broken | Sabin Basyal | 2015-04-15 | 1 | -1/+1 |
* | | | | Merge pull request #12454 from jfrazelle/bump_version | Phil Estes | 2015-04-16 | 2 | -1/+21 |
|\ \ \ \ | |||||
| * | | | | bump version to 1.6.0-dev | Jessica Frazelle | 2015-04-16 | 1 | -1/+1 |
| * | | | | Bump version to v1.6.0 | Jessica Frazelle | 2015-04-16 | 2 | -1/+21 |
|/ / / / | |||||
* | | | | Merge pull request #12428 from icecrime/1163_carry | Michael Crosby | 2015-04-16 | 1 | -2/+14 |
|\ \ \ \ | |||||
| * | | | | added documentation for functions | Jason Smith | 2015-04-15 | 1 | -2/+14 |
* | | | | | Merge pull request #12407 from cpuguy83/move_integration_api_tests | Alexander Morozov | 2015-04-16 | 4 | -329/+281 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Move TestPostCreateNull to integration-cli | Brian Goff | 2015-04-16 | 2 | -61/+56 |
| * | | | | Move TestPostJsonVerify to integration-cli | Brian Goff | 2015-04-16 | 3 | -41/+42 |
| * | | | | Move TestContainerApiCreate to integration-cli | Brian Goff | 2015-04-16 | 2 | -40/+27 |
| * | | | | Move TestPostCommit to integration-cli | Brian Goff | 2015-04-16 | 2 | -39/+29 |
| * | | | | Move TestGetContainersTop to integration-cli | Brian Goff | 2015-04-16 | 2 | -74/+41 |
| * | | | | Move SaveAndThenload to integration-cli | Brian Goff | 2015-04-16 | 2 | -61/+31 |
| * | | | | Make sockRequestRaw return reader, not []byte | Brian Goff | 2015-04-16 | 2 | -13/+55 |
* | | | | | Merge pull request #12451 from moxiegirl/release-versions-set | Jessie Frazelle | 2015-04-16 | 2 | -4/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | for 1.6 | Mary Anthony | 2015-04-16 | 2 | -4/+5 |
* | | | | | Merge pull request #12350 from runcom/remove-job-restart | Alexander Morozov | 2015-04-16 | 3 | -21/+13 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove job from restart | Antonio Murdaca | 2015-04-16 | 3 | -21/+13 |
|/ / / / | |||||
* | | | | Merge pull request #12431 from YanFeng-Adam/typo | Brian Goff | 2015-04-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix a typo in docker/daemon/state.go | Yan Feng | 2015-04-16 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12423 from crosbymichael/idkbutitworks | Jessie Frazelle | 2015-04-15 | 2 | -21/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Ensure state is destroyed on daemont restart | Michael Crosby | 2015-04-15 | 2 | -21/+6 |
* | | | | Merge pull request #12426 from moxiegirl/new-registry-menu | Sven Dowideit | 2015-04-16 | 5 | -16/+42 |
|\ \ \ \ | |||||
| * | | | | In with the old menu layout | Mary Anthony | 2015-04-15 | 5 | -16/+42 |
* | | | | | Merge pull request #12253 from calavera/remove_job_from_start_and_create | Brian Goff | 2015-04-15 | 23 | -317/+517 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Decode container configurations into typed structures. | David Calavera | 2015-04-15 | 23 | -260/+486 |
| * | | | | Make integration tests to call the new start and create endpoints. | David Calavera | 2015-04-14 | 2 | -36/+31 |
| * | | | | Remove engine.Job from Create action. | David Calavera | 2015-04-14 | 4 | -68/+53 |
| * | | | | Remove engine.Job from Start action. | David Calavera | 2015-04-14 | 5 | -55/+49 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #12388 from xiaods/issue-12373 | Alexander Morozov | 2015-04-15 | 8 | -10/+10 |
|\ \ \ \ | |||||
| * | | | | client.StatusError don't be returned as a pointer | Deshi Xiao | 2015-04-16 | 8 | -10/+10 |
* | | | | | Merge pull request #12391 from ibuildthecloud/syslog-format | Jessie Frazelle | 2015-04-15 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Change syslog format and facility | Darren Shepherd | 2015-04-15 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #12412 from runcom/12410-fix-TestInitializeCannotStatPathF... | Brian Goff | 2015-04-15 | 1 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | Fix TestInitializeCannotStatPathFileNameTooLong | Antonio Murdaca | 2015-04-15 | 1 | -5/+5 |
|/ / / / | |||||
* | | | | Merge pull request #12369 from runcom/fix-links-graph-ref | Alexander Morozov | 2015-04-15 | 2 | -5/+53 |
|\ \ \ \ | |||||
| * | | | | Fix wrong graphdb refs paths purging | Antonio Murdaca | 2015-04-14 | 2 | -5/+53 |
* | | | | | Merge pull request #12387 from x1022as/inspect-logpath | Brian Goff | 2015-04-15 | 3 | -2/+9 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Inspect show right LogPath in json-file driver | Deng Guangxing | 2015-04-15 | 3 | -2/+9 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12399 from emirozer/master | moxiegirl | 2015-04-15 | 1 | -17/+23 |
|\ \ \ \ | |||||
| * | | | | closes #8945 | Emir Ozer | 2015-04-15 | 1 | -17/+23 |
| |/ / / | |||||
* | | | | Merge pull request #12139 from hqhq/hq_add_cpusest_mems2 | Brian Goff | 2015-04-15 | 17 | -9/+75 |
|\ \ \ \ | |||||
| * | | | | Add cpuset-mems support for docker build | Qiang Huang | 2015-04-15 | 7 | -7/+16 |
| * | | | | add support for cpuset.mems | Qiang Huang | 2015-04-15 | 11 | -2/+59 |