[docker-io/f20: 2/2] Merge branch 'master' into f20
by Vincent Batts
commit acf8b1ac3b8b94d0d8b836b8ee0da928b1a83900
Merge: 06435b5 afcbe33
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed Nov 27 12:29:38 2013 -0500
Merge branch 'master' into f20
docker-io.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
10 years, 5 months
[docker-io/el6] add libcgroup dep bz#1034919
by Vincent Batts
commit afcbe33feb13e5626c9c04b9ab2cedaaf76fc6d4
Author: Vincent Batts <vbatts(a)redhat.com>
Date: Wed Nov 27 12:15:19 2013 -0500
add libcgroup dep
bz#1034919
docker-io.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 48a9670..665bb25 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
Name: docker-io
Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -48,6 +48,9 @@ Requires: lxc
Requires: tar
Provides: lxc-docker = %{version}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1034919
+Requires: libcgroup
+
%description
Docker is an open-source engine that automates the deployment of any
application as a lightweight, portable, self-sufficient container that will
@@ -147,6 +150,9 @@ exit 0
%dir %{_sharedstatedir}/docker
%changelog
+* Wed Nov 27 2013 Vincent Batts <vbatts(a)redhat.com> - 0.7.0-2
+- add libcgroup require (BZ #1034919)
+
* Tue Nov 26 2013 Marek Goldmann <mgoldman(a)redhat.com> - 0.7.0-1
- Upstream release 0.7.0
- Using upstream script to build the binary
10 years, 5 months
[docker-io/f20: 3/3] Merge branch 'master' into f20
by Lokesh Mandvekar
commit 06435b5dd948ca5d4f019931eb7bef40f904e707
Merge: a38ea80 dc9edd7
Author: Lokesh Mandvekar <lsm5(a)redhat.com>
Date: Wed Nov 27 08:38:48 2013 -0600
Merge branch 'master' into f20
.gitignore | 11 ++---------
docker-bridge_flag.patch | 16 ----------------
docker-io.spec | 41 ++++++++++++++++++-----------------------
sources | 2 +-
4 files changed, 21 insertions(+), 49 deletions(-)
---
10 years, 5 months