[docker-io: 8/14] Merge branch 'master' into sysvinit
commit 7e407b86523a0017234e8c4134ca145c0e2b5efc
Merge: 1e67a79 4819476
Author: Adam Miller <admiller(a)redhat.com>
Date: Sat Nov 23 01:58:02 2013 -0600
Merge branch 'master' into sysvinit
* master:
rc version bump
Conflicts:
docker-io.spec
docker-io.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc docker-io.spec
index b171053,f6f9b33..7425278
--- a/docker-io.spec
+++ b/docker-io.spec
@@@ -11,7 -11,7 +11,7 @@@
Name: docker-io
Version: 0.7
- Release: 0.18.rc6%{?dist}
-Release: 0.18.rc7%{?dist}
++Release: 0.19.rc7%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@@ -21,12 -21,11 +21,12 @@@ Patch2: docker-bridge_flag.patc
URL: http://www.docker.io
# only x86_64 for now: https://github.com/dotcloud/docker/issues/136
ExclusiveArch: x86_64
- Source0:
https://github.com/dotcloud/docker/archive/%{commit}/docker-%{shortcommit...
+ Source0:
https://github.com/crosbymichael/docker/archive/%{commit}/docker-%{shortc...
Source1: docker.service
-# though final name for xinetd file is simply 'docker',
-# having .xinetd makes things clear
-Source2: docker.xinetd
+# though final name for sysconf/sysvinit files is simply 'docker',
+# having .sysvinit and .sysconfig makes things clear
+Source2: docker.sysconfig
+Source3: docker.sysvinit
BuildRequires: gcc
BuildRequires: glibc-static
BuildRequires: golang(github.com/gorilla/mux)
@@@ -153,8 -146,9 +153,12 @@@ exit
%dir %{_sharedstatedir}/docker
%changelog
- * Fri Nov 22 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 0.7-0.18.rc6
++* Fri Nov 22 2013 Adam Miller <maxamillion(a)fedoraproject.org> - 0.7-0.19.rc7
+- Remove xinetd entry, added sysvinit
++
+ * Fri Nov 22 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7-0.18.rc7
+ - rc version bump
+
* Wed Nov 20 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7-0.17.rc6
- removed ExecStartPost lines from docker.service (BZ #1026045)
- dockerinit listed in files