summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump to version 0.8.0v0.8.0Michael Crosby2014-02-042-1/+21
* Merge pull request #3928 from metalivedev/fixheadingsAndy Rothfusz2014-02-042-2/+3
|\
| * Fixes headings in Table of Contents, link from FAQ.Andy Rothfusz2014-02-042-2/+3
* | Merge pull request #3929 from ostezer/masterAndy Rothfusz2014-02-041-3/+3
|\ \
| * | mac-installation-docs: Update the installation dir.O.S.Tezer2014-02-051-3/+3
* | | Merge pull request #3927 from tianon/release-checklist-mention-contributorsMichael Crosby2014-02-041-0/+8
|\ \ \ | |_|/ |/| |
| * | Update RELEASE-CHECKLIST to mention how to get a decent contributors listTianon Gravi2014-02-041-0/+8
* | | Merge pull request #3926 from tianon/update-mailmapMichael Crosby2014-02-042-5/+27
|\ \ \
| * | | Update .mailmap and AUTHORSTianon Gravi2014-02-042-5/+27
|/ / /
* | | Merge pull request #3918 from ostezer/masterAndy Rothfusz2014-02-041-54/+115
|\ \ \ | |/ / |/| / | |/
| * docs: Installation on Mac OS X 10.6 Snow LeopardO.S.Tezer2014-02-041-54/+115
|/
* Merge pull request #3254 from shykes/onbuildGuillaume J. Charmes2014-02-044-19/+119
|\
| * builder: clearly display ONBUILD triggers during a build.Solomon Hykes2014-02-042-7/+7
| * New build instruction: ONBUILD defines a trigger to execute when extending an...Solomon Hykes2014-02-044-1/+92
| * Builder: extract the execution of a single build step into buildFile.BuildStepSolomon Hykes2014-02-041-19/+28
* | Merge pull request #3557 from unclejack/improve_vagrantfileunclejack2014-02-041-2/+10
|\ \
| * | improve the Vagrant VMsunclejack2014-02-041-2/+10
* | | Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fixunclejack2014-02-041-2/+2
|\ \ \
| * | | iptables: use dest_addr and dest_port for public port FORWARD ruleJosh Poimboeuf2014-02-041-2/+2
| |/ /
* | | Merge pull request #3919 from SvenDowideit/missing-quoteAndy Rothfusz2014-02-041-1/+1
|\ \ \ | |/ / |/| |
| * | missing quote quotaSven Dowideit2014-02-041-1/+1
* | | Merge pull request #3920 from SvenDowideit/hack-spellingTianon Gravi2014-02-031-3/+3
|\ \ \ | |/ / |/| |
| * | i was reading, and it sprang out at me :)Sven Dowideit2014-02-041-3/+3
|/ /
* | Merge pull request #3897 from sandaya/masterTianon Gravi2014-02-031-0/+1
|\ \ | |/ |/|
| * Update mkimage-arch.shSamuel Andaya2014-02-031-0/+1
* | Merge pull request #3915 from crosbymichael/no-double-putunclejack2014-02-032-4/+8
|\ \
| * | Fix unmounts out of container export funcsMichael Crosby2014-02-031-3/+7
| * | Do not call Put twice and do not call it on deferMichael Crosby2014-02-031-1/+1
* | | Merge pull request #3887 from proppy/detect-network-mtuGuillaume J. Charmes2014-02-035-12/+40
|\ \ \
| * | | docs/cli: add mtu optionJohan Euphrosine2014-02-031-0/+1
| * | | docker/config: update -mtu flag defaultJohan Euphrosine2014-02-033-6/+7
| * | | networkdriver: add ErrNoDefaultRouteJohan Euphrosine2014-02-031-2/+4
| * | | docker: detect defaultNetworkMtu from default routeJohan Euphrosine2014-02-013-7/+31
* | | | Merge pull request #3188 from keyvanfatehi/vagrant-port-forwarding-listunclejack2014-02-031-4/+16
|\ \ \ \
| * | | | Vagrantfile port forwarding usages documented. Added usage via envvar FORWARD...Keyvan Fatehi2014-02-031-4/+16
| | |/ / | |/| |
* | | | Merge pull request #3883 from metalivedev/fix-3879Andy Rothfusz2014-02-033-13/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Updated width to 815 per comment.Andy Rothfusz2014-02-031-1/+1
| * | | Fixes #3879 by updating embedding of ascii.io (now asciinema.io)Andy Rothfusz2014-01-313-13/+24
* | | | Merge pull request #3908 from crosbymichael/fix-login-promptunclejack2014-02-032-5/+5
|\ \ \ \
| * | | | Fix login prompt on push and pull because of error messageMichael Crosby2014-02-032-5/+5
* | | | | Merge pull request #3911 from crosbymichael/fix-remove-volumeGuillaume J. Charmes2014-02-031-23/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix comparing binds and volume ids from other containersMichael Crosby2014-02-031-23/+38
|/ / / /
* | | | Merge pull request #3906 from tianon/unprefix-ubuntuTianon Gravi2014-02-032-2/+2
|\ \ \ \
| * | | | Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-da...Tianon Gravi2014-02-032-2/+2
|/ / / /
* | | | Merge pull request #3904 from alexlarsson/fix-docker-commit-outputMichael Crosby2014-02-031-1/+1
|\ \ \ \
| * | | | Fix docker commit outputAlexander Larsson2014-02-031-1/+1
| | |/ / | |/| |
* | | | Merge pull request #3893 from tianon/clean-up-btrfs-error-messagesMichael Crosby2014-02-031-3/+3
|\ \ \ \
| * | | | Fix several btrfs driver error messagesTianon Gravi2014-02-031-3/+3
| |/ / /
* | | | Merge pull request #3892 from tianon/remove-btrfs-header-referenceMichael Crosby2014-02-033-7/+4
|\ \ \ \
| * | | | Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we'...Tianon Gravi2014-02-013-7/+4
| |/ / /