summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-09-14 11:01:17 -0400
committerGitHub <noreply@github.com>2018-09-14 11:01:17 -0400
commitb873fe760a3d3462c8f73e86195fedcacc543be0 (patch)
treeab3224c27244a32d7b5193ca1c1223fe077bb967
parent316c31a840af789f2000b04737eda185201cd67f (diff)
parent2d6bfe5f50ed7ac92a4d8b9f02acbde284e83116 (diff)
downloadpodman-b873fe760a3d3462c8f73e86195fedcacc543be0.tar.gz
podman-b873fe760a3d3462c8f73e86195fedcacc543be0.tar.bz2
podman-b873fe760a3d3462c8f73e86195fedcacc543be0.zip
Merge pull request #1473 from mheon/update_gitvalidation_epoch
Update gitvalidation epoch to avoid a bad commit
-rw-r--r--Makefile2
-rw-r--r--README.md10
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 0277c19b0..7345675ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 6ffce631db6e01f66b09cb0e894600182caa872c
+EPOCH_TEST_COMMIT ?= 0cb0849c722f3e1c41d2005488cc2951b8d16f53
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/README.md b/README.md
index b5580b6ce..bd4f2c0d5 100644
--- a/README.md
+++ b/README.md
@@ -66,11 +66,11 @@ Information about contributing to this project.
## Current Roadmap
-1. Varlink API for Podman
+1. Python frontend for Varlink API
1. Integrate libpod into CRI-O to replace its existing container management backend
-1. Pod commands for Podman
-1. Rootless containers
-1. Support for cleaning up containers via post-run hooks
+1. Further work on the podman pod command
+1. Further improvements on rootless containers
+1. In-memory locking to replace file locks
[spec-hooks]: https://github.com/opencontainers/runtime-spec/blob/v2.0.1/config.md#posix-platform-hooks
@@ -103,5 +103,5 @@ storage differences, you can not see Podman containers from within Buildah or vi
In short Buildah is an efficient way to create OCI images while Podman allows
you to manage and maintain those images and containers in a production environment using
-familiar container cli commands. For more details, see the
+familiar container cli commands. For more details, see the
[Container Tools Guide](https://github.com/projectatomic/buildah/tree/master/docs/containertools).