summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Update basic setup instructions"revert-12383-patch-1moxiegirl2015-04-161-6/+2
* Merge pull request #12383 from jdivock/patch-1moxiegirl2015-04-161-2/+6
|\
| * Update basic setup instructionsJason Divock2015-04-141-2/+6
* | Merge pull request #12452 from moxiegirl/release-versions-setmoxiegirl2015-04-161-1/+1
|\ \
| * | Updating with final version from StephenMary Anthony2015-04-161-1/+1
* | | Merge pull request #12411 from sbasyal/patch-2moxiegirl2015-04-161-1/+1
|\ \ \
| * | | The link to issue 407 was brokenSabin Basyal2015-04-151-1/+1
* | | | Merge pull request #12454 from jfrazelle/bump_versionPhil Estes2015-04-162-1/+21
|\ \ \ \
| * | | | bump version to 1.6.0-devJessica Frazelle2015-04-161-1/+1
| * | | | Bump version to v1.6.0Jessica Frazelle2015-04-162-1/+21
|/ / / /
* | | | Merge pull request #12428 from icecrime/1163_carryMichael Crosby2015-04-161-2/+14
|\ \ \ \
| * | | | added documentation for functionsJason Smith2015-04-151-2/+14
* | | | | Merge pull request #12407 from cpuguy83/move_integration_api_testsAlexander Morozov2015-04-164-329/+281
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Move TestPostCreateNull to integration-cliBrian Goff2015-04-162-61/+56
| * | | | Move TestPostJsonVerify to integration-cliBrian Goff2015-04-163-41/+42
| * | | | Move TestContainerApiCreate to integration-cliBrian Goff2015-04-162-40/+27
| * | | | Move TestPostCommit to integration-cliBrian Goff2015-04-162-39/+29
| * | | | Move TestGetContainersTop to integration-cliBrian Goff2015-04-162-74/+41
| * | | | Move SaveAndThenload to integration-cliBrian Goff2015-04-162-61/+31
| * | | | Make sockRequestRaw return reader, not []byteBrian Goff2015-04-162-13/+55
* | | | | Merge pull request #12451 from moxiegirl/release-versions-setJessie Frazelle2015-04-162-4/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | for 1.6Mary Anthony2015-04-162-4/+5
* | | | | Merge pull request #12350 from runcom/remove-job-restartAlexander Morozov2015-04-163-21/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove job from restartAntonio Murdaca2015-04-163-21/+13
|/ / / /
* | | | Merge pull request #12431 from YanFeng-Adam/typoBrian Goff2015-04-161-1/+1
|\ \ \ \
| * | | | Fix a typo in docker/daemon/state.goYan Feng2015-04-161-1/+1
|/ / / /
* | | | Merge pull request #12423 from crosbymichael/idkbutitworksJessie Frazelle2015-04-152-21/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Ensure state is destroyed on daemont restartMichael Crosby2015-04-152-21/+6
* | | | Merge pull request #12426 from moxiegirl/new-registry-menuSven Dowideit2015-04-165-16/+42
|\ \ \ \
| * | | | In with the old menu layoutMary Anthony2015-04-155-16/+42
* | | | | Merge pull request #12253 from calavera/remove_job_from_start_and_createBrian Goff2015-04-1523-317/+517
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Decode container configurations into typed structures.David Calavera2015-04-1523-260/+486
| * | | | Make integration tests to call the new start and create endpoints.David Calavera2015-04-142-36/+31
| * | | | Remove engine.Job from Create action.David Calavera2015-04-144-68/+53
| * | | | Remove engine.Job from Start action.David Calavera2015-04-145-55/+49
| | |_|/ | |/| |
* | | | Merge pull request #12388 from xiaods/issue-12373Alexander Morozov2015-04-158-10/+10
|\ \ \ \
| * | | | client.StatusError don't be returned as a pointerDeshi Xiao2015-04-168-10/+10
* | | | | Merge pull request #12391 from ibuildthecloud/syslog-formatJessie Frazelle2015-04-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Change syslog format and facilityDarren Shepherd2015-04-151-1/+1
| |/ / /
* | | | Merge pull request #12412 from runcom/12410-fix-TestInitializeCannotStatPathF...Brian Goff2015-04-151-5/+5
|\ \ \ \
| * | | | Fix TestInitializeCannotStatPathFileNameTooLongAntonio Murdaca2015-04-151-5/+5
|/ / / /
* | | | Merge pull request #12369 from runcom/fix-links-graph-refAlexander Morozov2015-04-152-5/+53
|\ \ \ \
| * | | | Fix wrong graphdb refs paths purgingAntonio Murdaca2015-04-142-5/+53
* | | | | Merge pull request #12387 from x1022as/inspect-logpathBrian Goff2015-04-153-2/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Inspect show right LogPath in json-file driverDeng Guangxing2015-04-153-2/+9
| | |/ / | |/| |
* | | | Merge pull request #12399 from emirozer/mastermoxiegirl2015-04-151-17/+23
|\ \ \ \
| * | | | closes #8945Emir Ozer2015-04-151-17/+23
| |/ / /
* | | | Merge pull request #12139 from hqhq/hq_add_cpusest_mems2Brian Goff2015-04-1517-9/+75
|\ \ \ \
| * | | | Add cpuset-mems support for docker buildQiang Huang2015-04-157-7/+16
| * | | | add support for cpuset.memsQiang Huang2015-04-1511-2/+59