delta/docker.git - github.com: dotcloud/docker.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #54 from shykes/vieux_merge_masterv0.7.0-rc6	Michael Crosby	2013-11-19	3	-23/+13
\|\
\| *	Merge branch 'master' into vieux_merge_master	Victor Vieux	2013-11-19	1	-3/+0
\| \|\
\| \| *	Merge pull request #2777 from dotcloud/fix_port_stop_start	Victor Vieux	2013-11-19	1	-3/+0
\| \| \|\
\| \| \| *	don't import emport empty hostconfig	Victor Vieux	2013-11-19	1	-3/+0
\| \| \|/
\| * \|	Merge branch 'master' into vieux_merge_master	Victor Vieux	2013-11-19	2	-20/+13
\| \|\ \ \|/ / / \| \| _
\| *	Merge pull request #2750 from jpoimboe/simplify-register-reconnect	Michael Crosby	2013-11-19	1	-17/+10
\| \|\
\| \| *	simplify the runtime Register reconnect logic	Josh Poimboeuf	2013-11-19	1	-17/+10
\| * \|	Merge pull request #2748 from jpoimboe/fix-restart-race-condition	Victor Vieux	2013-11-19	1	-3/+3
\| \|\ \
\| \| * \|	fix container restart race condition	Josh Poimboeuf	2013-11-18	1	-3/+3
\| \| \|/
* \| \|	Merge pull request #53 from shykes/improve_cleanup	Michael Crosby	2013-11-19	2	-6/+23
\|\ \ \
\| * \| \|	improve aufs cleanup and debugging	Victor Vieux	2013-11-19	2	-6/+23
* \| \| \|	Merge pull request #39 from crosbymichael/add-driver-flag	Victor Vieux	2013-11-19	4	-3/+19
\|\ \ \ \
\| * \| \| \|	Check env var for setting driver in tests	Michael Crosby	2013-11-19	1	-2/+9
\| * \| \| \|	Add flag to set default graph driver	Michael Crosby	2013-11-19	4	-4/+13
\| \|/ / /
* \| \| \|	Merge pull request #52 from crosbymichael/rename-aufs-driver	Victor Vieux	2013-11-19	4	-29/+29
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Rename AufsDriver to Driver to be consistent	Michael Crosby	2013-11-19	4	-29/+29
\|/ / /
* \| \|	Merge pull request #50 from crosbymichael/limit-dm	Guillaume J. Charmes	2013-11-19	2	-0/+33
\|\ \ \
\| * \| \|	Prohibit more than 42 layers in the core	Michael Crosby	2013-11-19	2	-0/+33
* \| \| \|	Merge pull request #48 from crosbymichael/reset-mtime	Guillaume J. Charmes	2013-11-19	1	-7/+39
\|\ \ \ \
\| * \| \| \|	Ensure same atime, mtime after applying whiteouts	Michael Crosby	2013-11-19	1	-7/+39
* \| \| \| \|	Merge pull request #41 from alexlarsson/dm-plugin-device-tool	Guillaume J. Charmes	2013-11-19	6	-100/+446
\|\ \ \ \ \
\| * \| \| \| \|	Move docker-device-tool to contrib	Alexander Larsson	2013-11-19	1	-0/+0
\| * \| \| \| \|	devicemapper tool: Add support for pool resizing	Alexander Larsson	2013-11-19	4	-20/+228
\| * \| \| \| \|	devmapper: Update device-mapper-tool	Alexander Larsson	2013-11-19	3	-38/+176
* \| \| \| \| \|	Merge pull request #49 from shykes/creack-merge-master	Michael Crosby	2013-11-19	64	-2261/+2844
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix unit-tests	Guillaume J. Charmes	2013-11-19	4	-83/+23
\| * \| \| \| \|	Merge branch 'master' into creack-merge-master	Guillaume J. Charmes	2013-11-19	62	-2189/+2832
\| \|\ \ \ \ \ \|/ / / / / / \| \| \| \| _ / \| \| \| \| /
\| * \| \| \|	Merge pull request #2759 from dotcloud/lintify-1	Michael Crosby	2013-11-19	11	-208/+199
\| \|\ \ \ \
\| \| * \| \| \|	Lintify code with confidence=1	Guillaume J. Charmes	2013-11-18	11	-208/+199
\| * \| \| \| \|	Merge pull request #2757 from Painted-Fox/patch-2	Andy Rothfusz	2013-11-19	1	-15/+4
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix quote mistake.	Ryan Seto	2013-11-19	1	-1/+1
\| \| * \| \| \| \|	Correct the quotations in the command to add the -r=false flag. Thanks to @t...	Ryan Seto	2013-11-18	1	-1/+1
\| \| * \| \| \| \|	Simplify the upstart example in host_integration.rst	Ryan Seto	2013-11-18	1	-15/+4
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #2770 from tianon/better-man-page	Andy Rothfusz	2013-11-19	2	-2/+2
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Switch sphinx man_pages generation to use commandline/cli instead of toctree ...	Tianon Gravi	2013-11-19	2	-2/+2
\| * \| \| \| \| \|	Merge pull request #2766 from sbellem/doc-improvements	Andy Rothfusz	2013-11-19	2	-3/+3
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	fixed typos, and made small improvements to the wording	Sylvain Bellemare	2013-11-19	2	-3/+3
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge pull request #2734 from zitrusmedia/master	Daniel Mizyrycki	2013-11-19	1	-3/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Vagrantfile modified to support VBoxGuestAdditions_4.3.2	Frederik Loeffert	2013-11-17	1	-3/+3
\| * \| \| \| \| \|	Merge pull request #2719 from metalivedev/2702-knownissue-lxc-start-failed-to...	Andy Rothfusz	2013-11-18	2	-13/+36
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Fixes #2702. Also cleans up formatting and long lines in volumes doc.	Andy Rothfusz	2013-11-18	2	-13/+36
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #2755 from metalivedev/test-2592	Andy Rothfusz	2013-11-18	4	-16/+26
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Fix typos, add links, streamline content of #2592	Andy Rothfusz	2013-11-15	3	-25/+20
\| \| * \| \| \| \| \|	Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into t...	Andy Rothfusz	2013-11-15	4	-3/+18
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	- Included the sudo alternative as an example_header	Roberto Gandolfo Hashioka	2013-11-07	2	-2/+7
\| \| \| * \| \| \| \| \|	- Fix the attach examples according to the new attach behavior	Roberto Gandolfo Hashioka	2013-11-07	4	-4/+14
\| * \| \| \| \| \| \| \|	Merge pull request #2721 from metalivedev/2701-addmedia	Andy Rothfusz	2013-11-18	3	-2/+279
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fixes #2701. Adds security section.	Andy Rothfusz	2013-11-15	3	-2/+279
\| * \| \| \| \| \| \| \|	Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup	Victor Vieux	2013-11-18	1	-0/+1
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Fix tmp dir never cleanup	Victor Vieux	2013-11-15	1	-0/+1
\| \| \|/ / / / / / /