terminalmage pushed to salt (epel7). "Update to bugfix release 2014.7.5"

[notifications at fedoraproject.org]

>From a095c1f783b7a4d0ca188be74b80f63933fb7121 Mon Sep 17 00:00:00 2001
From: Erik Johnson <erik at saltstack.com>
Date: Fri, 17 Apr 2015 14:39:19 -0500
Subject: Update to bugfix release 2014.7.5


diff --git a/.gitignore b/.gitignore
index 3680499..8c71a08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /salt-2014.7.2.tar.gz
 /SaltTesting-2015.2.16.tar.gz
 /salt-2014.7.4.tar.gz
+/salt-2014.7.5.tar.gz
diff --git a/salt.spec b/salt.spec
index 87215ff..130f765 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,8 +15,8 @@
 %define _salttesting_ver 2015.2.16
 
 Name: salt
-Version: 2014.7.4
-Release: 4%{?dist}
+Version: 2014.7.5
+Release: 1%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -445,6 +445,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Apr 17 2015 Erik Johnson <erik at saltstack.com> - 2014.7.5-1
+- Update to bugfix release 2014.7.5
+
 * Tue Apr  7 2015 Erik Johnson <erik at saltstack.com> - 2014.7.4-4
 - Fix RH bug #1210316 and Salt bug #22003
 
diff --git a/skip_tests_2014.7.4.patch b/skip_tests_2014.7.4.patch
deleted file mode 100644
index 9f6c796..0000000
--- a/skip_tests_2014.7.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
-index 57ba81e..713f3cd 100644
---- a/tests/unit/pydsl_test.py
-+++ b/tests/unit/pydsl_test.py
-@@ -9,7 +9,7 @@ import textwrap
- from cStringIO import StringIO
- 
- # Import Salt Testing libs
--from salttesting import TestCase
-+from salttesting import TestCase, skipIf
- from salttesting.helpers import ensure_in_syspath
- 
- ensure_in_syspath('../')
-@@ -298,6 +298,7 @@ class PyDSLRendererTestCase(TestCase):
-         finally:
-             shutil.rmtree(dirpath, ignore_errors=True)
- 
-+    @skipIf(True, 'Not failing in jenkins, skip for this build')
-     def test_rendering_includes(self):
-         dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
-         if not os.path.isdir(dirpath):
diff --git a/skip_tests_2014.7.5.patch b/skip_tests_2014.7.5.patch
new file mode 100644
index 0000000..9f6c796
--- /dev/null
+++ b/skip_tests_2014.7.5.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index 57ba81e..713f3cd 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -9,7 +9,7 @@ import textwrap
+ from cStringIO import StringIO
+ 
+ # Import Salt Testing libs
+-from salttesting import TestCase
++from salttesting import TestCase, skipIf
+ from salttesting.helpers import ensure_in_syspath
+ 
+ ensure_in_syspath('../')
+@@ -298,6 +298,7 @@ class PyDSLRendererTestCase(TestCase):
+         finally:
+             shutil.rmtree(dirpath, ignore_errors=True)
+ 
++    @skipIf(True, 'Not failing in jenkins, skip for this build')
+     def test_rendering_includes(self):
+         dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
+         if not os.path.isdir(dirpath):
diff --git a/sources b/sources
index e9288ad..e1f660d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1d10c9c3d4983829f5ec49cd29f8426e  salt-2014.7.4.tar.gz
+4cec89fc463740d38b7b8baefac77813  salt-2014.7.5.tar.gz
 9a073ab776ebaa7a5911a94e799f757d  SaltTesting-2015.2.16.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/salt.git/commit/?h=epel7&id=a095c1f783b7a4d0ca188be74b80f63933fb7121