From efe758d4888aca3ae460bed153ea0997e18de3c7 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 5 Jun 2015 15:25:07 +0000 Subject: [PATCH] Merged upstream. --- sysutils/salt/patches/patch-salt_utils___init___py | 4 ++-- sysutils/salt/patches/patch-salt_utils_network_py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/salt/patches/patch-salt_utils___init___py b/sysutils/salt/patches/patch-salt_utils___init___py index a5668a68405..90c665e5cb5 100644 --- a/sysutils/salt/patches/patch-salt_utils___init___py +++ b/sysutils/salt/patches/patch-salt_utils___init___py @@ -1,6 +1,6 @@ -$OpenBSD: patch-salt_utils___init___py,v 1.1 2015/06/05 10:39:25 ajacoutot Exp $ +$OpenBSD: patch-salt_utils___init___py,v 1.2 2015/06/05 15:25:07 ajacoutot Exp $ -https://github.com/saltstack/salt/pull/24442 +https://github.com/saltstack/salt/commit/aacf1ebf085721267631a3dfc3bf385a30c60736 --- salt/utils/__init__.py.orig Fri Jun 5 12:23:27 2015 +++ salt/utils/__init__.py Fri Jun 5 12:23:42 2015 diff --git a/sysutils/salt/patches/patch-salt_utils_network_py b/sysutils/salt/patches/patch-salt_utils_network_py index ebd8832b13c..d40b15310d3 100644 --- a/sysutils/salt/patches/patch-salt_utils_network_py +++ b/sysutils/salt/patches/patch-salt_utils_network_py @@ -1,6 +1,6 @@ -$OpenBSD: patch-salt_utils_network_py,v 1.1 2015/06/05 10:39:25 ajacoutot Exp $ +$OpenBSD: patch-salt_utils_network_py,v 1.2 2015/06/05 15:25:07 ajacoutot Exp $ -https://github.com/saltstack/salt/pull/24442 +https://github.com/saltstack/salt/commit/aacf1ebf085721267631a3dfc3bf385a30c60736 --- salt/utils/network.py.orig Fri Jun 5 12:12:44 2015 +++ salt/utils/network.py Fri Jun 5 12:13:53 2015