summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Debianizedebian/0.1.1-1Jeremy Grosser2013-03-139-0/+75
* Add makefileupstream/0.1.1Jeremy Grosser2013-03-131-0/+23
* Fix merge issuecreack2013-03-121-4/+18
* Merge master within fscreack2013-03-129-80/+200
|\
| * Merge pull request #58 from lopter/masterSolomon Hykes2013-03-121-0/+1
| |\
| | * Automatically remove the rcfile generated by docker -i from /tmpLouis Opter2013-03-121-0/+1
| * | Merge pull request #57 from kencochrane/vagrant-fixSolomon Hykes2013-03-122-3/+12
| |\ \ | | |/ | |/|
| | * upgraded kernel to 3.5.0-25 to fix a kernel bugKen Cochrane2013-03-122-3/+12
| * | Merge pull request #48 from dotcloud/memorylimitsSolomon Hykes2013-03-127-33/+108
| |\ \
| | * | Missed a renameSam Alba2013-03-111-2/+2
| | * | Added -m to the run command in order to set a memory limit to a containerSam Alba2013-03-111-3/+13
| | * | Renamed Container property Ram to Memory before it is too lateSam Alba2013-03-113-26/+26
| | * | Implemented unit tests for the generated LXC configSam Alba2013-03-114-19/+67
| | * | Added support for RamSwap in the generated LXC config (to limit the swap and ...Sam Alba2013-03-112-2/+18
| | * | Set the memory soft limit to the same value than the hard limitSam Alba2013-03-111-0/+1
| * | | Merge remote-tracking branch 'remotes/chooper/help-ux'Solomon Hykes2013-03-121-31/+40
| |\ \ \
| | * | | Add all commands to the output of 'dotcloud help'. Fixes #39Charles Hooper2013-03-111-18/+36
| | * | | Complete fix for #38 -- fix double-usage on helpCharles Hooper2013-03-111-11/+0
| | * | | Fix CmdInspect and CmdImages help/parsing. Fixes #38Charles Hooper2013-03-111-3/+5
| | |/ /
| * | | Merge pull request #53 from jpetazzo/cloudinitSolomon Hykes2013-03-121-23/+44
| |\ \ \
| | * | | Add script upload instructionsJérôme Petazzoni2013-03-111-2/+6
| | * | | Get rid of bashismJérôme Petazzoni2013-03-111-2/+2
| | * | | Try to load, or install, AUFS modulesJérôme Petazzoni2013-03-111-2/+28
| | * | | Use "start" instead of "restart"Jérôme Petazzoni2013-03-111-2/+2
| | * | | Stream and unpack the tarball on the flyJérôme Petazzoni2013-03-111-14/+4
| | * | | Add missing shebangjpetazzo2013-03-111-1/+2
| * | | | Merge pull request #43 from kencochrane/vagrant-fixSolomon Hykes2013-03-122-6/+14
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | changed the docker version in vagrant to pull down latest version, moved some...Ken Cochrane2013-03-111-5/+12
| | * | added a fix to the upstart command that wasn't setting hte LOCALE correctly, ...Ken Cochrane2013-03-111-1/+2
| |/ /
* | | Add *.orig to .gitignorecreack2013-03-121-0/+1
* | | Merge branch 'fs' of https://github.com/dotcloud/docker into fsGuillaume J. Charmes2013-03-123-85/+116
|\ \ \
| * | | 'docker run' works with paths as well as image IDsshin-2013-03-122-1/+21
| * | | Merge branch 'fs' of github.com:dotcloud/docker into fsshin-2013-03-128-54/+44
| |\ \ \
| * | | | Re-enabled cat, write and ls ; Added creation date to image metadatashin-2013-03-123-84/+95
* | | | | gofmtGuillaume J. Charmes2013-03-125-10/+10
* | | | | Add TestCommitRun unit testGuillaume J. Charmes2013-03-121-15/+56
* | | | | Add parent when needed on store.Create, fix the mountpoint on store.layer.Guillaume J. Charmes2013-03-121-2/+4
* | | | | Put back the relative paths for dev purposeGuillaume J. Charmes2013-03-126-11/+11
* | | | | Add "nuke" function to docker tests to avoid disk space wasteGuillaume J. Charmes2013-03-127-5/+28
| |/ / / |/| | |
* | | | Replaced 'pull' and 'put' with 'import'Solomon Hykes2013-03-111-45/+33
* | | | Fix a bug which caused dockerd to crash at startup if a container didn't have...Solomon Hykes2013-03-111-1/+3
* | | | Change relative paths to absoluteGuillaume J. Charmes2013-03-118-13/+13
|/ / /
* | | post-merge repairsshin-2013-03-114-7/+6
* | | Merged upstream changes in fs branchshin-2013-03-1112-502/+138
|\ \ \
| * | | Removed deprecated docker/image packageSolomon Hykes2013-03-091-342/+0
| * | | Fixed a bug which caused dockerd to not create its DB if an empty /var/lib/do...Solomon Hykes2013-03-091-4/+2
| * | | Fixed a bug which caused docker to crash at startup while restoring existing ...Solomon Hykes2013-03-093-7/+14
| * | | gofmtSolomon Hykes2013-03-0921-313/+283
* | | | Merged master branch into fsshin-2013-03-1130-454/+1508
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Setup a predictable, repeatable environment for containersSolomon Hykes2013-03-072-0/+58