Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6aa116d

Browse files
author
Nicole Thomas
authored
Merge branch 'develop' into develop
2 parents bc27217 + 6b54f62 commit 6aa116d

File tree

300 files changed

+57763
-15668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+57763
-15668
lines changed

‎conf/cloud‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727

2828
# The level of messages to send to the console.
29-
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
29+
# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
3030
#
3131
# The following log levels are considered INSECURE and may log sensitive data:
3232
# ['garbage', 'trace', 'debug']

‎conf/master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@
11571157
#log_level: warning
11581158

11591159
# The level of messages to send to the log file.
1160-
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
1160+
# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
11611161
# If using 'log_granular_levels' this must be set to the highest desired level.
11621162
#log_level_logfile: warning
11631163

‎conf/minion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@
720720
#key_logfile: /var/log/salt/key
721721

722722
# The level of messages to send to the console.
723-
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
723+
# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
724724
#
725725
# The following log levels are considered INSECURE and may log sensitive data:
726726
# ['garbage', 'trace', 'debug']

‎conf/proxy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@
543543
#key_logfile: /var/log/salt/key
544544

545545
# The level of messages to send to the console.
546-
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
546+
# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
547547
#
548548
# The following log levels are considered INSECURE and may log sensitive data:
549549
# ['garbage', 'trace', 'debug']

‎conf/suse/master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ syndic_user: salt
11001100
#key_logfile: /var/log/salt/key
11011101

11021102
# The level of messages to send to the console.
1103-
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
1103+
# One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
11041104
#
11051105
# The following log levels are considered INSECURE and may log sensitive data:
11061106
# ['garbage', 'trace', 'debug']

‎doc/man/salt-api.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-API" "1" "Jan 24, 2018" "2017.7.3" "Salt"
3+
.TH "SALT-API" "1" "Feb 23, 2018" "2018.3.0" "Salt"
44
.SH NAME
55
salt-api \- salt-api Command
66
.

‎doc/man/salt-call.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-CALL" "1" "Jan 24, 2018" "2017.7.3" "Salt"
3+
.TH "SALT-CALL" "1" "Feb 23, 2018" "2018.3.0" "Salt"
44
.SH NAME
55
salt-call \- salt-call Documentation
66
.

‎doc/man/salt-cloud.1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-CLOUD" "1" "Jan 24, 2018" "2017.7.3" "Salt"
3+
.TH "SALT-CLOUD" "1" "Feb 23, 2018" "2018.3.0" "Salt"
44
.SH NAME
55
salt-cloud \- Salt Cloud Command
66
.
@@ -197,7 +197,7 @@ New in version 2014.7.0.
197197

198198
.sp
199199
Display a list of configured profiles. Pass in a cloud provider to view
200-
the provider\(aqs associated profiles, such as \fBdigital_ocean\fP, or pass in
200+
the provider\(aqs associated profiles, such as \fBdigitalocean\fP, or pass in
201201
\fBall\fP to list all the configured profiles.
202202
.UNINDENT
203203
.SS Cloud Providers Listings

‎doc/man/salt-cp.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-CP" "1" "Jan 24, 2018" "2017.7.3" "Salt"
3+
.TH "SALT-CP" "1" "Feb 23, 2018" "2018.3.0" "Salt"
44
.SH NAME
55
salt-cp \- salt-cp Documentation
66
.

‎doc/man/salt-key.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH "SALT-KEY" "1" "Jan 24, 2018" "2017.7.3" "Salt"
3+
.TH "SALT-KEY" "1" "Feb 23, 2018" "2018.3.0" "Salt"
44
.SH NAME
55
salt-key \- salt-key Documentation
66
.

0 commit comments

Comments
 (0)