8000 Add master_finger to base opts · linuxadmin/salt@2face12 · GitHub
[go: up one dir, main page]

Skip to content

Commit 2face12

Browse files
committed
Add master_finger to base opts
1 parent 4115393 commit 2face12

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

doc/topics/releases/0.10.3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The latest taste of Salt has come, this release has many fixes and feature
66
additions. Modifications have been made to make ZeroMQ connections more
77
reliable, the begining of the ACL system is in place, a new command line
88
parsing system has been added, dynamic module distribution has become more
9-
environment aware, the new `master_fingerprint` option and many more!
9+
environment aware, the new `master_finger` option and many more!
1010

1111
Major Features
1212
==============

salt/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ def minion_config(path):
151151
'''
152152
opts = {'master': 'salt',
153153
'master_port': '4506',
154+
'master_finger': '',
154155
'user': 'root',
155156
'root_dir': '/',
156157
'pki_dir': '/etc/salt/pki',

0 commit comments

Comments
 (0)
0