diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-01-10 15:40:56 -0500 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-01-10 15:41:19 -0500 |
commit | 76c57f55cacb7916ca451e378d181b1c30c94032 (patch) | |
tree | 775fafbd2dcefae1b1731744219dc2410e985800 /.cirrus.yml | |
parent | 6e8aeab472154e2b1eff92683803d16af06d2b30 (diff) | |
download | podman-76c57f55cacb7916ca451e378d181b1c30c94032.tar.gz podman-76c57f55cacb7916ca451e378d181b1c30c94032.tar.bz2 podman-76c57f55cacb7916ca451e378d181b1c30c94032.zip |
Revert "Merge pull request #1235 from mheon/shm_locking"
This reverts commit bf5f779331870d31863c486619daae3fcea458eb, reversing
changes made to 6868b5aa1444404113bc6a4582203fbbf89490c2.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to '.cirrus.yml')
-rw-r--r-- | .cirrus.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 199c2a533..d1029d554 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -115,7 +115,7 @@ build_each_commit_task: matrix: image_name: "fedora-29-libpod-9afa57a9" - timeout_in: 30m + timeout_in: 20m script: - $SCRIPT_BASE/setup_environment.sh |