Solomon Hykes
|
a18600bdd2
|
Merge branch 'master' of ssh://github.com/dotcloud/docker
|
2013-04-04 17:00:59 -07:00 |
Solomon Hykes
|
7ce6865bce
|
Merge pull request #322 from sa2ajj/port-map-nitpick
change option description to reflect the semantics
|
2013-04-04 16:39:54 -07:00 |
Solomon Hykes
|
23fd680475
|
Merge remote-tracking branch 'dominikh/minor-code-touchups'
|
2013-04-04 16:20:37 -07:00 |
Solomon Hykes
|
a9dbbd3916
|
Merge pull request #331 from lynaghk/master
Fix broken link on documentation website between examples.
|
2013-04-04 16:18:27 -07:00 |
Solomon Hykes
|
5b65e0a84a
|
Merge pull request #320 from sa2ajj/cli-docs
move each command description into a separate document
|
2013-04-04 16:17:53 -07:00 |
Solomon Hykes
|
6cc488ecac
|
Merge remote-tracking branch 'origin/257-container_real_running_state-fix'
|
2013-04-04 15:34:18 -07:00 |
Solomon Hykes
|
6abb7d99d6
|
Merge remote-tracking branch 'dominikh/improve-attachopts'
|
2013-04-04 15:18:41 -07:00 |
Solomon Hykes
|
2245ebc19b
|
Merge remote-tracking branch 'unclejack/137-fix-nat'
|
2013-04-04 15:06:20 -07:00 |
Solomon Hykes
|
7e5b9d5aac
|
Merge remote-tracking branch 'origin/328-i_o_error_uncloced_connection-fix'
|
2013-04-04 11:03:39 -07:00 |
Solomon Hykes
|
c134a07fc7
|
Merged attachStdin
|
2013-04-02 20:46:32 -07:00 |
Solomon Hykes
|
3cc9e37add
|
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
|
2013-04-02 20:35:13 -07:00 |
Solomon Hykes
|
46995a4448
|
Merged shawnsi/git-version
|
2013-04-02 20:26:22 -07:00 |
Solomon Hykes
|
dfe5d4589b
|
Merge remote-tracking branch 'sa2ajj/hostname-parameter'
|
2013-04-02 18:41:14 -07:00 |
Solomon Hykes
|
a3259c02a3
|
Merged dhrp/docs
|
2013-04-02 18:39:39 -07:00 |
Solomon Hykes
|
b8bd060a66
|
Merge remote-tracking branch 'unclejack/194-high-image-compression'
|
2013-04-02 18:10:07 -07:00 |
Solomon Hykes
|
3290da50c4
|
Merge branch 'master' into attach-stdin
|
2013-04-02 18:07:45 -07:00 |
shin-
|
d8a0da314a
|
Merge branch 'master' into 257-container_real_running_state-fix
|
2013-04-02 06:37:50 -07:00 |
Joffrey F
|
b739d1d208
|
Merge pull request #317 from dotcloud/307-loginfix
Fix for #307
|
2013-04-02 03:01:23 -07:00 |
Solomon Hykes
|
2bc6bf653e
|
Merge pull request #288 from titanous/expand-contributing
Expand the contributing guidelines
|
2013-04-01 18:45:18 -07:00 |
Solomon Hykes
|
4e4b1f9449
|
Merge pull request #312 from sa2ajj/devenv-doc-fix
fix code block formatting
|
2013-04-01 18:40:29 -07:00 |
Thatcher Peskens
|
71eca45395
|
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
|
2013-04-01 18:11:46 -07:00 |
Guillaume J. Charmes
|
fc5a9d3706
|
Merge pull request #286 from titanous/285-close-bodies
Close HTTP response bodies
|
2013-04-01 17:59:22 -07:00 |
Solomon Hykes
|
e031f94c4f
|
Merge pull request #305 from fsouza/master
Makefile: simplify "fmt" target
|
2013-04-01 16:28:29 -07:00 |
Solomon Hykes
|
97dfbf5335
|
Merge pull request #304 from paulhammond/mkimage-busybox-fixes
Fix mkimage-busybox
|
2013-04-01 14:38:00 -07:00 |
Solomon Hykes
|
485192bfbc
|
Merge remote-tracking branch 'origin/progress_bar_push_pull'
|
2013-04-01 13:49:07 -07:00 |
Solomon Hykes
|
29785f28f8
|
Merge branch 'master' of ssh://github.com/dotcloud/docker
|
2013-04-01 13:44:19 -07:00 |
Solomon Hykes
|
c6d47d6cf4
|
Merge pull request #300 from cespare/make-fmt
Add a 'fmt' target to the Makefile.
|
2013-04-01 13:41:53 -07:00 |
Guillaume J. Charmes
|
1af226d71c
|
Merge pull request #301 from dotcloud/container_test_improvment-1
Avoid destroy() timeout by closing stdin in TestStart()
|
2013-04-01 13:36:02 -07:00 |
Guillaume J. Charmes
|
ba996f19e7
|
Merge pull request #298 from cespare/cleanup-1
Some style, text, and comment cleanup.
|
2013-04-01 13:26:40 -07:00 |
Solomon Hykes
|
d23a62ec39
|
Merge pull request #238 from johncosta/42-contribution-guidelines
Contribution guidelines
|
2013-03-31 22:14:18 -07:00 |
Solomon Hykes
|
3ee401ca8f
|
Merge pull request #272 from dominikh/improve/lazy-ip-allocator
Make IP allocator lazy
|
2013-03-31 21:04:35 -07:00 |
Solomon Hykes
|
93c4cf0444
|
Merge remote-tracking branch 'origin/125-reattach_attached_run_command-fix'
|
2013-03-31 00:20:31 -07:00 |
Guillaume J. Charmes
|
32bd1459d4
|
Merge pull request #269 from cespare/gofmt-1
Gofmt.
|
2013-03-30 12:46:47 -07:00 |
Solomon Hykes
|
07e00a5a48
|
Merge remote-tracking branch 'robryk/cmdstream-deadlock'
|
2013-03-29 23:43:02 -07:00 |
Solomon Hykes
|
1c6bd7304d
|
Merge remote-tracking branch 'origin/improve_container_tests'
|
2013-03-29 23:41:09 -07:00 |
Solomon Hykes
|
8096fb50a0
|
Merge pull request #265 from dotcloud/formating_debug_harmonize
Formating debug harmonize
|
2013-03-29 21:30:43 -07:00 |
Solomon Hykes
|
d9cbad385c
|
Merge pull request #266 from dotcloud/do_not_log_stopped_container
Do not log non-running containers
|
2013-03-29 21:29:19 -07:00 |
Solomon Hykes
|
bb25ad5bb7
|
Merge remote-tracking branch 'origin/264-remove_cmdAttach_option'
|
2013-03-29 20:30:43 -07:00 |
Solomon Hykes
|
d9bdf1336b
|
Merge remote-tracking branch 'lopter/master'
|
2013-03-29 20:17:33 -07:00 |
Solomon Hykes
|
4d78830132
|
Merge remote-tracking branch 'robryk/bufreader-race'
|
2013-03-29 13:50:33 -07:00 |
Solomon Hykes
|
fcc1465281
|
Merge pull request #250 from metachord/master
Remove unnecessary path parts
|
2013-03-29 13:42:23 -07:00 |
Solomon Hykes
|
f520b833e9
|
Merge remote-tracking branch 'robryk/cmdstream-deadlock'
|
2013-03-29 13:20:17 -07:00 |
Solomon Hykes
|
e81af6a450
|
Merged Ctrl-C interception by @creack
|
2013-03-29 13:12:04 -07:00 |
Solomon Hykes
|
a4d985ac41
|
Merging dhrp/docs
|
2013-03-28 19:12:58 -07:00 |
Solomon Hykes
|
bb1a721aa5
|
Merge pull request #241 from titanous/cleanup-deps
Remove unneeded sqlite deps from puppet and debian control
|
2013-03-28 18:45:44 -07:00 |
Solomon Hykes
|
7f1ac7a120
|
Merge pull request #244 from dotcloud/docs-julien
Docs: Changed the url of the LEGO img to point to the one with copyright
|
2013-03-28 18:45:20 -07:00 |
Solomon Hykes
|
d30d6cd0f4
|
Merge remote-tracking branch 'shawnsi/iptables-wrapper'
|
2013-03-28 18:40:02 -07:00 |
Solomon Hykes
|
3feea6f0d2
|
Merge remote-tracking branch 'titanous/camelize'
|
2013-03-28 18:23:59 -07:00 |
Solomon Hykes
|
b793b52f9d
|
Merge pull request #246 from titanous/update-authors
Update AUTHORS and add .mailmap
|
2013-03-28 18:19:05 -07:00 |
Solomon Hykes
|
c16624b8e0
|
Merge remote-tracking branch 'origin/165-push_permission_check-fix'
|
2013-03-28 15:45:00 -07:00 |