14ef6d2b51
- splitting out the susemanager integration plugins into their own subpackages. ATM this only contains the zypp plugin to tell susemanager about manually installed packages. - Unit and integration tests fixes for 2016.3.2 Add: * 0018-Unit-tests-fixes-for-2016.3.2.patch * 0019-Fix-snapper_test-for-python26.patch * 0020-Integration-tests-fixes-for-2016.3.2.patch - Prevent pkg.install failure for expired keys (bsc#996455) Add: * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch - Required D-Bus and generating machine ID where it is missing - Fix sphinx crashes when documentation is being generated Add script for documentation update. Add: * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * update-documentation.sh - Fix pkg.installed refresh repo failure (bsc#993549) Fix salt.states.pkgrepo.management no change failure (bsc#990440) Add: * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch - Deprecate status.uptime one version later Add: OBS-URL: https://build.opensuse.org/request/show/430691 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=77
26 lines
643 B
Diff
26 lines
643 B
Diff
From d19c9591c1dfbafec24a7d76402dcc9e2b17b047 Mon Sep 17 00:00:00 2001
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
Date: Thu, 4 Aug 2016 11:28:19 +0200
|
|
Subject: [PATCH 13/13] Deprecate status.uptime one version later
|
|
|
|
---
|
|
salt/modules/status.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/modules/status.py b/salt/modules/status.py
|
|
index 029426b..cebd57b 100644
|
|
--- a/salt/modules/status.py
|
|
+++ b/salt/modules/status.py
|
|
@@ -132,7 +132,7 @@ def custom():
|
|
return ret
|
|
|
|
|
|
-@with_deprecated(globals(), "Boron")
|
|
+@with_deprecated(globals(), "Carbon")
|
|
def uptime():
|
|
'''
|
|
Return the uptime for this system.
|
|
--
|
|
2.9.2
|
|
|