summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-01-16 17:33:56 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-27 06:48:20 +0000
commit3aa63b2b941aac40c5e3639b0880922b842052ab (patch)
tree83bc6337500b3f5ef0f94a0f94f87f6a3549f01b /README.md
parentfb58b873981d2fd0d4f97036afab2aa2ce9e1633 (diff)
downloadpodman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.gz
podman-3aa63b2b941aac40c5e3639b0880922b842052ab.tar.bz2
podman-3aa63b2b941aac40c5e3639b0880922b842052ab.zip
Remove conmon, get package from CRI-O
conmon should not be built in two different places. conmon is now a separate package in Fedora so we can just add requires, for use on Ubuntu we can just require cri-o to be installed. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #151 Approved by: mheon
Diffstat (limited to 'README.md')
-rw-r--r--README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/README.md b/README.md
index 54d1aeec4..abdb854b5 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ The plan is to use OCI projects and best of breed libraries for different aspect
- Images: Image management using [containers/image](https://github.com/containers/image)
- Storage: Storage and management of image layers using [containers/storage](https://github.com/containers/storage)
- Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni)
+- Conmon: [conmon](https://github.com/kubernetes-incubator/cri-o) Conmon is a tool for monitoring OCI runtimes. Part of the CRI-O package
## Podman Information for Developers