33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From 64ddef78a040dde7e547518331dc9e8a98ceb42f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bo Maryniuk <bo@suse.de>
|
||
|
|
Date: Thu, 5 Jan 2017 19:09:17 +0100
|
||
|
|
Subject: [PATCH] Fix a typo for master comments
|
||
|
|
|
||
|
|
* Disable custom rosters in API
|
||
|
|
* Pick up a specified roster file from the configured locations
|
||
|
|
* Explain what it is about and how to configure that
|
||
|
|
* Add docstring
|
||
|
|
* Add explanation comment
|
||
|
|
* Lintfix
|
||
|
|
---
|
||
|
|
conf/master | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/conf/master b/conf/master
|
||
|
|
index f58eb496bf..3cfdae0a47 100644
|
||
|
|
--- a/conf/master
|
||
|
|
+++ b/conf/master
|
||
|
|
@@ -405,7 +405,7 @@ syndic_user: salt
|
||
|
|
# Pass in an alternative location for the salt-ssh roster file
|
||
|
|
#roster_file: /etc/salt/roster
|
||
|
|
|
||
|
|
-# Define a location for roster files so they can be chosen when using Salt API.
|
||
|
|
+# Define a locations for roster files so they can be chosen when using Salt API.
|
||
|
|
# An administrator can place roster files into these locations. Then when
|
||
|
|
# calling Salt API, parameter 'roster_file' should contain a relative path to
|
||
|
|
# these locations. That is, "roster_file=/foo/roster" will be resolved as
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|
||
|
|
|