Everything has been merged uptream.

This commit is contained in:
ajacoutot 2014-08-28 06:32:56 +00:00
parent a54cf29c78
commit 23407304b8
3 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-salt_modules_bsd_shadow_py,v 1.1 2014/08/27 10:26:59 ajacoutot Exp $
$OpenBSD: patch-salt_modules_bsd_shadow_py,v 1.2 2014/08/28 06:32:56 ajacoutot Exp $
https://github.com/saltstack/salt/pull/15306
https://github.com/saltstack/salt/commit/2e4318132e53451658777924b66e0e38b7c7b0ac
--- salt/modules/bsd_shadow.py.orig Tue Jun 17 21:18:30 2014
+++ salt/modules/bsd_shadow.py Wed Aug 27 09:41:10 2014

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-salt_modules_disk_py,v 1.1 2014/08/27 10:26:59 ajacoutot Exp $
$OpenBSD: patch-salt_modules_disk_py,v 1.2 2014/08/28 06:32:56 ajacoutot Exp $
https://github.com/saltstack/salt/pull/15305
https://github.com/saltstack/salt/commit/015fc5121466dd8dad3f6116bd3d1bf373761ac6
--- salt/modules/disk.py.orig Fri Aug 1 20:38:41 2014
+++ salt/modules/disk.py Wed Aug 27 09:05:35 2014

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-salt_modules_groupadd_py,v 1.1 2014/08/27 10:26:59 ajacoutot Exp $
$OpenBSD: patch-salt_modules_groupadd_py,v 1.2 2014/08/28 06:32:56 ajacoutot Exp $
https://github.com/saltstack/salt/pull/15307
https://github.com/saltstack/salt/commit/7f302190ebe517b8e18f836e20fa535e7ea37b96
--- salt/modules/groupadd.py.orig Fri Aug 1 20:38:41 2014
+++ salt/modules/groupadd.py Wed Aug 27 12:20:56 2014