Commit graph

938 commits

Author SHA1 Message Date
Michael Crosby
cb97fa8495 Merge pull request #402 from miaoyq/fix-a-description-err
Fix a description error
2017-01-09 15:08:46 -08:00
Kenfe-Mickaël Laventure
017d4b77f8 Merge pull request #401 from gliptak/warnings1
Correct vet warnings
2017-01-05 13:02:10 -08:00
Yanqiang Miao
e536030f42 Fix a description error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-01-04 11:40:50 +08:00
Qiang Huang
c23d3057b7 Merge pull request #404 from RobertNorthard/feature/fixed-typos
Updated README.md - fixed typos
2017-01-03 09:38:02 +08:00
Robert Northard
0c656ab503 Updated README.md - fixed typos
Signed-off-by: Robert Northard <robertnorthard@googlemail.com>
2016-12-27 18:58:19 +00:00
Gábor Lipták
102fb10fde Correct vet warnings
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
2016-12-20 17:10:01 -05:00
Kenfe-Mickaël Laventure
437c971e8c Merge pull request #393 from dims/fix-make-fmt-failure
Indent proto files with tabs only
2016-12-18 09:26:35 -08:00
Davanum Srinivas
4f8a784b41 Indent proto files with tabs only
fix "make fmt" failure by switching from spaces to tabs

Signed-Off-By: Davanum Srinivas <davanum@gmail.com>
2016-12-16 17:20:41 -05:00
Michael Crosby
3cdf1d8e41 Merge pull request #374 from hqhq/fix_typos
Fix some typos
2016-12-16 11:59:06 -08:00
Michael Crosby
4171ca0ca1 Merge pull request #391 from mlaventure/restore-and-cleanup
Add restore and small cleanup
2016-12-16 11:54:53 -08:00
Kenfe-Mickael Laventure
0fdd2469f6 execution: "restore" container on service creation
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-16 11:40:47 -08:00
Antonio Murdaca
98b39002ba
cmd/containerd: extend to other OCI runtimes
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-12-16 18:35:15 +01:00
Phil Estes
58640c9603 Merge pull request #388 from runcom/must-bundle-path
execution/oci: validate bundle path
2016-12-16 12:07:29 -05:00
Kenfe-Mickael Laventure
73cb78fae3 execution/oci: Add check when loading processes
This should ensure that we don't kill a different process after a
restore (once supported)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-16 08:49:09 -08:00
Kenfe-Mickael Laventure
abaa421141 execution/oci: use Status type instead of string
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-16 08:49:09 -08:00
Kenfe-Mickael Laventure
7dd69a8597 execution: use provided process ID for state
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-16 08:49:09 -08:00
Kenfe-Mickael Laventure
13399c1330 ctr: add events command
This simply print all events generated by containerd

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-12-16 08:49:09 -08:00
Kenfe-Mickaël Laventure
286ea04591 Merge pull request #385 from runcom/update-gitignore
.gitignore: remove unnecessary entries
2016-12-16 08:14:31 -08:00
Antonio Murdaca
d083334621
execution/oci: validate bundle path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-12-16 15:15:54 +01:00
Antonio Murdaca
db3a2a073e
.gitignore: remove unnecessary entries
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-12-16 10:06:10 +01:00
Qiang Huang
3b8eee7522 Fix some typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-12-16 09:31:19 +08:00
Stephen J Day
a812199b07 design: add data-flow design document
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-12-15 13:11:42 -08:00
Kenfe-Mickaël Laventure
95c13af2f9 Merge pull request #380 from AkihiroSuda/fix-events-test
Fix compilation error in events/events_test.go
2016-12-15 10:40:04 -08:00
Kenfe-Mickaël Laventure
767cf82f02 Merge pull request #368 from fedepad/fix-typo-oci-io
Fix small typo in oci/io.go
2016-12-15 08:15:50 -08:00
Kenfe-Mickaël Laventure
e751816c4d Merge pull request #375 from runcom/fix-indent
api/shim: fix indent
2016-12-15 08:15:21 -08:00
Akihiro Suda
cd26bbe7c1 Fix compilation error in events/events_test.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-15 15:53:16 +00:00
Phil Estes
b1f9f5e033 Merge pull request #377 from swapdisk/master
fix typos
2016-12-15 10:10:03 -05:00
Phil Estes
b109bc0587 Merge pull request #373 from coolljt0725/fix_typo
architecture.md: fix typo
2016-12-15 09:55:34 -05:00
swapdisk
6c90052c7d fix typos
Signed-off-by: swapdisk <swapdisk@users.noreply.github.com>
2016-12-15 08:05:05 -06:00
Antonio Murdaca
a5fa2c5536
api/shim: fix indent
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-12-15 10:33:03 +01:00
Lei Jitang
a6b8f2d14d architecture.md: fix typo
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-12-14 22:15:01 -05:00
Phil Estes
65d82868c2 Merge pull request #372 from fedepad/fix-some-typos-snapshots-doc
Fix some typos in snapshots.md
2016-12-15 03:32:23 +01:00
Kenfe-Mickaël Laventure
4bbc774e78 Merge pull request #369 from fedepad/fix-small-typo-architecture-descr
Fix typo "subssystem" -> "subsystem"
2016-12-14 18:30:42 -08:00
Federico Padua
462b3b29e8 Fix some typos in snapshots.md
Fixes a couple of typos in design/snapshots.md

Signed-off-by: Federico Padua <federico_padua@yahoo.it>
2016-12-15 03:08:34 +01:00
Federico Padua
878430d4c3 Fix typo "subssystem" -> "subsystem"
Fixes typo "subssystem" -> "subsystem" in architecture.md file

Signed-off-by: Federico Padua <federico_padua@yahoo.it>
2016-12-15 01:24:30 +01:00
Federico Padua
41931dbe8f Fix small typo in oci/io.go
This commit fixes a typo in execution/executors/oci/io.go: "the" -> "to"

Signed-off-by: Federico Padua <federico_padua@yahoo.it>
2016-12-15 01:02:07 +01:00
Michael Crosby
22772224e6 Merge pull request #367 from alesr/fix-typo-contributing-file
Fix typo in CONTRIBUTING.md
2016-12-14 15:35:15 -08:00
Alessandro Resta
fe5a359001 Fix typo in CONTRIBUTING.md
Minor typo fix, changing "wierd" by "weird".

Signed-off-by: Alessandro Resta <alessandro.resta@gmail.com>
2016-12-14 23:25:39 +00:00
Michael Crosby
a9d7465777 Merge pull request #366 from leonardinius/patch-1
typo in README.md / gsub 's:my the:by the:'
2016-12-14 14:43:30 -08:00
Leonids Maslovs
52ae947bf6 typo in README.md / gsub 's:my the:by the:'
Minor typo fix

Signed-off-by: Leonids Maslovs <leonidms@gmail.com>
2016-12-15 00:03:55 +02:00
Kenfe-Mickaël Laventure
d8552c6c6b Merge pull request #363 from crosbymichael/comms
Update state of branches and slack link
2016-12-14 13:19:46 -08:00
Michael Crosby
ad8516e3a7 Update state of branches and slack link
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-12-14 11:15:12 -08:00
Kenfe-Mickaël Laventure
294d9d6ffa Merge pull request #361 from cpuguy83/stray_containerkit
Replace containerkit references with containerd
2016-12-14 07:42:03 -08:00
Brian Goff
273492bc6d Replace containerkit references with containerd
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-14 09:34:25 -05:00
Arnaud Porterie (icecrime)
25b14eba2f
Fix containerd casing
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-12-13 17:25:41 -08:00
Arnaud Porterie (icecrime)
35821a4562
Update README.md
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-12-13 16:56:24 -08:00
Arnaud Porterie (icecrime)
fd996741a7
Fix identation
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-12-13 16:42:38 -08:00
Michael Crosby
6e25568d14 Make large changes explicit
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-12-13 16:32:56 -08:00
Stephen J Day
4f04e52d74
CONTRIBUTING: add some notes about contributions
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-12-13 15:36:59 -08:00
Stephen Day
b1f547c13b README: correct spelling of my name 2016-12-13 14:35:56 -08:00