Andy Rothfusz
|
bbfc531b51
|
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
move the contributing hook into contrib, and use curl in the same way as the gofmt above
|
2014-01-27 12:09:03 -08:00 |
Andy Rothfusz
|
093531ddb7
|
Merge pull request #3781 from mattymo/patch-1
Clean up grammar on puppet.rst
|
2014-01-27 12:06:43 -08:00 |
Andy Rothfusz
|
adae0b248d
|
Merge pull request #3773 from mnaberez/supervisord-apache2-example
Use exec to replace bash with apache2 after environment is set up
|
2014-01-27 12:01:59 -08:00 |
Andy Rothfusz
|
ef37fdd1a8
|
Merge pull request #3770 from aaronfeng/fix-image-name-pos
move image name into correct position
|
2014-01-27 11:56:36 -08:00 |
Victor Vieux
|
f9e9637a9f
|
Merge pull request #3756 from crosbymichael/fix-register-nobridge
Refactor and fix register interface when bridge does not exist
|
2014-01-27 10:40:42 -08:00 |
mattymo
|
551e1a766c
|
Update puppet.rst
|
2014-01-27 18:21:48 +03:00 |
mattymo
|
03d9984f17
|
Clean up grammar on puppet.rst
|
2014-01-27 15:13:17 +03:00 |
Mike Naberezny
|
2ba2a8ae40
|
Use exec to replace bash with apache2 after environment is set up
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com> (github: mnaberez)
|
2014-01-26 11:53:22 -08:00 |
James Turnbull
|
ffdc2d2657
|
Merge pull request #3771 from srt32/patch-1
Update README.md typo
|
2014-01-26 09:07:00 -08:00 |
Aaron Feng
|
31e5958009
|
move image name into correct position
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
|
2014-01-26 08:11:30 -05:00 |
Simon Taranto
|
33ee78004f
|
Update README.md
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com> (github: srt32)
|
2014-01-26 00:08:55 -07:00 |
Guillaume J. Charmes
|
b1d26985d0
|
Update tests to have custom routes
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
|
2014-01-24 17:18:48 -08:00 |
Guillaume J. Charmes
|
eedaf08eb8
|
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
|
2014-01-24 17:02:19 -08:00 |
Victor Vieux
|
e6ae8f6d21
|
Merge pull request #3757 from vieux/auth_job
move auth to a job
|
2014-01-24 16:54:48 -08:00 |
Victor Vieux
|
1f8b1bb84e
|
move auth to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 16:51:02 -08:00 |
Victor Vieux
|
e2003fea3a
|
Merge pull request #3728 from vieux/container_job
Move containers to a job
|
2014-01-24 16:10:46 -08:00 |
Victor Vieux
|
5ea2986ce5
|
Move containers to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 16:07:42 -08:00 |
Victor Vieux
|
748a009cc4
|
Merge pull request #3727 from vieux/push_job
push job
|
2014-01-24 15:42:22 -08:00 |
Victor Vieux
|
e8ee18fa29
|
push job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 15:34:08 -08:00 |
Victor Vieux
|
4a708f9f5b
|
Merge pull request #3739 from vieux/events_jobs
move events to job
|
2014-01-24 15:32:25 -08:00 |
Victor Vieux
|
5cc6312bfc
|
move events to job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 15:28:17 -08:00 |
Victor Vieux
|
59df776469
|
Merge pull request #3621 from vieux/inspect_job
Inspect job
|
2014-01-24 15:22:20 -08:00 |
Victor Vieux
|
5fd8aa02ba
|
merge 2 jobs, no more buffer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 15:13:30 -08:00 |
Victor Vieux
|
a7e9baaf89
|
update attach to use the new job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 15:11:38 -08:00 |
Victor Vieux
|
134435a79c
|
move inspect to 2 jobs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 15:11:38 -08:00 |
Victor Vieux
|
22fb3e0f38
|
Merge pull request #3645 from vieux/rmi_job
Move rmi to a job
|
2014-01-24 15:10:02 -08:00 |
Victor Vieux
|
f41e0cf048
|
fix error handling
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 14:59:46 -08:00 |
Victor Vieux
|
177f658882
|
remove buffer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 14:57:18 -08:00 |
Victor Vieux
|
564e6bc780
|
Move docker rmi to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 14:55:11 -08:00 |
Victor Vieux
|
4a96c329c0
|
Merge pull request #3725 from vieux/pull_import_job
Pull import job
|
2014-01-24 14:47:40 -08:00 |
Victor Vieux
|
35641f0ec7
|
remove useless flush method
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 14:46:31 -08:00 |
Victor Vieux
|
90e9a2d85a
|
fix flush
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 14:46:31 -08:00 |
Victor Vieux
|
9dcbdbc4b1
|
move pull and import to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-24 14:46:31 -08:00 |
Victor Vieux
|
9d44298c5e
|
Merge pull request #3741 from vieux/build_job
move build to a job
|
2014-01-24 11:34:32 -08:00 |
Victor Vieux
|
56ec121925
|
Merge pull request #3726 from vieux/attach_stderr
don't user os.Stderr in attach
|
2014-01-24 10:55:55 -08:00 |
James Turnbull
|
f1fbf5f219
|
Merge pull request #3748 from metalivedev/fixarticles
Fix TOC for Articles
|
2014-01-24 10:01:54 -08:00 |
Andy Rothfusz
|
6cae33ca0f
|
Fix TOC for Articles
|
2014-01-23 18:55:26 -08:00 |
Victor Vieux
|
641005777a
|
Merge pull request #3747 from crosbymichael/move-networking
Move IP Allocator into sub package and out of the core
|
2014-01-23 16:43:21 -08:00 |
Victor Vieux
|
42e35ecff3
|
remove useless anonymous field mentions
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-23 16:20:51 -08:00 |
Victor Vieux
|
415379e45d
|
move build to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-23 16:08:05 -08:00 |
Andy Rothfusz
|
a71e7fe8ab
|
Merge pull request #3730 from SvenDowideit/JSON-RUN-format-docs
talk about the new exec form of RUN (Closes #3723) implemented by #3558
|
2014-01-23 15:54:00 -08:00 |
Victor Vieux
|
0dd856ee7f
|
Merge pull request #3724 from creack/extract-lxc-phase-2
Refactor process to command
|
2014-01-23 15:28:45 -08:00 |
Victor Vieux
|
f948820d03
|
Merge pull request #3743 from pmorie/typo
Fix typo in comment in container.go
|
2014-01-23 15:15:18 -08:00 |
Paul Morie
|
2f57eb0410
|
Fix typo in container.go
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
|
2014-01-23 18:10:33 -05:00 |
Michael Crosby
|
ec73c23231
|
Refactor and fix register interface when bridge does not exist
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
|
2014-01-23 14:39:10 -08:00 |
Victor Vieux
|
1896934616
|
Merge pull request #3742 from vieux/update_todo
no more TODO
|
2014-01-23 12:57:00 -08:00 |
Victor Vieux
|
5d71ad8b19
|
no more TODO
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
|
2014-01-23 12:55:58 -08:00 |
Victor Vieux
|
4e08bb5629
|
Merge pull request #3740 from tianon/fix-mflag-dyntest
Fix mflag test issue with "ResetForTesting"
|
2014-01-23 12:09:08 -08:00 |
Tianon Gravi
|
f60eee4894
|
Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
|
2014-01-23 13:03:17 -07:00 |
Victor Vieux
|
7687b3cec1
|
Merge pull request #3738 from vieux/update_todo
update REMOTE_TODO.md
|
2014-01-23 10:51:38 -08:00 |