Merged upstream.

This commit is contained in:
ajacoutot 2015-06-05 15:25:07 +00:00
parent 49506e58d3
commit efe758d488
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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