golang December 2013

golang@lists.fedoraproject.org

6 participants
108 discussions

[docker-io/el6: 4/4] Merge branch 'master' into el6
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

commit d2b4ea650a55e27f5b6bc503db3b1da28a5818d3 Merge: 40122bf 85e1946 Author: Lokesh Mandvekar <lsm5(a)redhat.com> Date: Mon Dec 2 10:20:03 2013 -0600 Merge branch 'master' into el6 80-docker.rules | 4 ++-- docker-io.spec | 9 ++++++++- docker.service | 1 - docker.sysvinit | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) ---

1 0

[docker-io/el6] (4 commits) ...Merge branch 'master' into el6
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

Summary of changes: 8e81a15... do not add masq (*) c9a11e7... Fix missing redirection to log file for sysvinit (*) 85e1946... udev rules unified for udisks 1&2, sysvinit fixes (*) d2b4ea6... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent

1 0

[docker-io/f19] (3 commits) ...udev rules unified for udisks 1&2, sysvinit fixes
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

Summary of changes: 8e81a15... do not add masq (*) c9a11e7... Fix missing redirection to log file for sysvinit (*) 85e1946... udev rules unified for udisks 1&2, sysvinit fixes (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[docker-io/f20: 3/3] Merge branch 'master' into f20
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

commit d23d04aa2711d0fc5f5289e707ab1f6099248c96 Merge: 50404bb 85e1946 Author: Lokesh Mandvekar <lsm5(a)redhat.com> Date: Mon Dec 2 09:50:12 2013 -0600 Merge branch 'master' into f20 80-docker.rules | 4 ++-- docker-io.spec | 6 +++++- docker.sysvinit | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) ---

1 0

[docker-io/f20] (3 commits) ...Merge branch 'master' into f20
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

Summary of changes: c9a11e7... Fix missing redirection to log file for sysvinit (*) 85e1946... udev rules unified for udisks 1&2, sysvinit fixes (*) d23d04a... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[docker-io] udev rules unified for udisks 1&2, sysvinit fixes
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

commit 85e1946835f95f261bf00d797b4c9b96ec58225f Author: Lokesh Mandvekar <lsm5(a)redhat.com> Date: Mon Dec 2 09:36:39 2013 -0600 udev rules unified for udisks 1&2, sysvinit fixes Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com> 80-docker.rules | 4 ++-- docker-io.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) --- diff --git a/80-docker.rules b/80-docker.rules index cbf5471..55273aa 100644 --- a/80-docker.rules +++ b/80-docker.rules @@ -1,2 +1,2 @@ -SUBSYSTEM=="block", ENV{DM_NAME}=="docker-*", ENV{UDISKS_IGNORE}="1" -SUBSYSTEM=="block", DEVPATH=="/devices/virtual/block/loop*", ATTR{loop/backing_file}=="/var/lib/docker/*", ENV{UDISKS_IGNORE}="1" +SUBSYSTEM=="block", ENV{DM_NAME}=="docker-*", ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1" +SUBSYSTEM=="block", DEVPATH=="/devices/virtual/block/loop*", ATTR{loop/backing_file}=="/var/lib/docker/*, ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1" diff --git a/docker-io.spec b/docker-io.spec index 209170a..3c032bb 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -14,7 +14,7 @@ Name: docker-io Version: 0.7.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 @@ -169,6 +169,10 @@ fi %{_sysconfdir}/udev/rules.d/80-docker.rules %changelog +* Mon Dec 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-14 +- sysvinit patch corrected (epel only) +- 80-docker.rules unified for udisks1 and udisks2 + * Mon Dec 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-13 - removed firewall-cmd --add-masquerade

1 0

[docker-io] Fix missing redirection to log file for sysvinit
by Marek Goldmann 02 Dec '13

02 Dec '13

commit c9a11e781a4be1e1cce9e816277916b7a9c3cae8 Author: Marek Goldmann <marek.goldmann(a)gmail.com> Date: Mon Dec 2 15:40:51 2013 +0100 Fix missing redirection to log file for sysvinit docker.sysvinit | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/docker.sysvinit b/docker.sysvinit index 7f0ed93..f748fa1 100644 --- a/docker.sysvinit +++ b/docker.sysvinit @@ -50,7 +50,8 @@ start() { if ! [ -f $pidfile ]; then prestart printf "Starting $prog:\t" - $exec -d $other_args 1>/dev/null 2>&1 & + echo "\n$(date)\n" >> $logfile + $exec -d $other_args &>> $logfile & pid=$! touch $lockfile success

1 0

[docker-io/f20: 2/2] Merge branch 'master' into f20
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

commit 50404bbbe8841934a8795b8ff3e0601020f6a730 Merge: 0148e79 8e81a15 Author: Lokesh Mandvekar <lsm5(a)redhat.com> Date: Mon Dec 2 08:00:47 2013 -0600 Merge branch 'master' into f20 docker-io.spec | 5 ++++- docker.service | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) ---

1 0

[docker-io/f20] (2 commits) ...Merge branch 'master' into f20
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

Summary of changes: 8e81a15... do not add masq (*) 50404bb... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[docker-io] do not add masq
by Lokesh Mandvekar 02 Dec '13

02 Dec '13

commit 8e81a15196a2abe238770e62fcfbf2a3bb88ae88 Author: Lokesh Mandvekar <lsm5(a)redhat.com> Date: Mon Dec 2 07:48:15 2013 -0600 do not add masq Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com> docker-io.spec | 5 ++++- docker.service | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index e9a5085..209170a 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -14,7 +14,7 @@ Name: docker-io Version: 0.7.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 @@ -169,6 +169,9 @@ fi %{_sysconfdir}/udev/rules.d/80-docker.rules %changelog +* Mon Dec 02 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-13 +- removed firewall-cmd --add-masquerade + * Sat Nov 30 2013 Lokesh Mandvekar <lsm5(a)redhat.com> - 0.7.0-12 - systemd for fedora >= 18 - firewalld in unit file changed from Requires to Wants diff --git a/docker.service b/docker.service index 0803497..220fc98 100644 --- a/docker.service +++ b/docker.service @@ -7,7 +7,6 @@ After=firewalld.service Type=simple ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 ExecStart=/usr/bin/docker -d -ExecStartPost=-/usr/bin/firewall-cmd --add-masquerade Restart=on-failure [Install]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

golang December 2013