Граф коммитов

9126 Коммитов

Автор SHA1 Сообщение Дата
Jeff Lindsay a86c85ae38 white space 2013-02-20 12:23:47 +00:00
Jeff Lindsay fb6d36a793 make sure the standard "replace input carriage returns with line feeds" and "replace output line feeds with carriage return and line feed" flags are set, even on raw (I dont think it should actually be raw) 2013-02-20 12:19:22 +00:00
Solomon Hykes 2a0f114c16 Merge pull request #15 from brianm/ignore-produced-binaries
ignore produced binaries
2013-02-19 22:58:24 -08:00
Solomon Hykes f713b6b9e3 Merge pull request #16 from brianm/master
Add notice about kr/pty in NOTICE
2013-02-19 22:58:01 -08:00
shin- 1282e466b0 Merge branch 'fs' of github.com:dotcloud/docker into fs 2013-02-18 16:37:58 -08:00
Andrea Luzzardi 86f0bcf716 Merge branch 'master' of github.com:dotcloud/docker 2013-02-15 10:55:55 -08:00
Solomon Hykes c8aea4f74b 'docker start' and 'docker restart': start or restart a container 2013-02-14 13:49:05 -08:00
Andrea Luzzardi b1593e3803 merge 2013-02-13 17:26:25 -08:00
Solomon Hykes 282ddc8e55 Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected. 2013-02-13 17:10:00 -08:00
Solomon Hykes d6d275ecff Merge 2013-02-13 14:59:24 -08:00
Andrea Luzzardi 3c5200b8f9 merge 2013-02-13 14:19:35 -08:00
Solomon Hykes eb3c631ce2 Merge pull request #12 from niallo/master
Easy setup w/ Vagrant & Puppet
2013-02-08 19:22:09 -08:00
Andrea Luzzardi 88ebc2ca5c Merge branch 'master' of github.com:dotcloud/docker 2013-01-29 15:51:30 -08:00
Solomon Hykes c59a497718 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-01-29 15:24:51 -08:00
Andrea Luzzardi a7cd43b577 Merge branch 'master' of github.com:dotcloud/docker 2013-01-28 17:32:38 -08:00
Solomon Hykes c18e43b102 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-01-28 14:23:39 -08:00
Andrea Luzzardi 7f86ae17cf merge conflicts 2013-01-28 12:06:49 -08:00
Solomon Hykes aaa34f2d4e Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-01-25 18:02:56 -08:00
Solomon Hykes 6100be37e6 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-01-25 15:42:43 -08:00
Andrea Luzzardi 717525de15 Merge branch 'master' of github.com:dotcloud/docker 2013-01-25 14:09:54 -08:00
Andrea Luzzardi 370094387f Merge branch 'master' of github.com:dotcloud/docker 2013-01-25 11:06:07 -08:00
Andrea Luzzardi 0546dc207c Merge branch 'master' of github.com:dotcloud/docker 2013-01-24 18:11:08 -08:00
Solomon Hykes 95b4974de6 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-01-22 18:58:04 -08:00
Andrea Luzzardi d990c838a1 Merge branch 'master' of github.com:dotcloud/docker 2013-01-22 11:13:38 -08:00
Solomon Hykes 192e573d76 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-01-21 18:15:19 -08:00
Andrea Luzzardi ac6b99d5db Initial commit 2013-01-18 16:13:39 -08:00