Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2017.7] Merge forward from 2017.7.7 to 2017.7 #48513

Merged
merged 14 commits into from Jul 11, 2018
Merged

[2017.7] Merge forward from 2017.7.7 to 2017.7 #48513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e4e62e8
Ensure that the shared list of jids is passed when creating the Minio…
garethgreenaway Jun 12, 2018
084de92
Merge pull request #48098 from rallytime/bp-48075-2017.7.7
Jun 14, 2018
d53569d
Add release notes file for 2017.7.7
Jun 14, 2018
217005b
Add missing `v` for tag reference
Jun 14, 2018
b0ba08f
Merge pull request #48134 from rallytime/release-notes-2017.7.7
Jun 14, 2018
fce1c31
bootstrap kitchen branch tests with 2017.7.6
gtmanfred Jun 14, 2018
8893bf0
Update man pages for 2017.7.7
Jun 14, 2018
baa0363
Merge pull request #48136 from gtmanfred/2017.7.7
Jun 14, 2018
b98c52e
Merge pull request #48140 from rallytime/man-pages-2017.7.7
Jun 14, 2018
d8209e8
always listen when gathering job info
gtmanfred Jun 15, 2018
8af4452
Merge pull request #48157 from gtmanfred/2017.7.7
Jun 17, 2018
a0ad794
Update release notes for 2017.7.7
Jun 17, 2018
cfd21ed
Merge pull request #48172 from rallytime/2017.7.7-release-notes
Jun 18, 2018
a466a48
Merge branch '2017.7.7' into '2017.7'
Jul 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .kitchen.yml
View file
Open in desktop
@@ -1,6 +1,6 @@
---
<% vagrant = system('gem list -i kitchen-vagrant 2>/dev/null >/dev/null') %>
<% version = '2017.7.4' %>
<% version = '2017.7.6' %>
<% platformsfile = ENV['SALT_KITCHEN_PLATFORMS'] || '.kitchen/platforms.yml' %>
<% driverfile = ENV['SALT_KITCHEN_DRIVER'] || '.kitchen/driver.yml' %>
<% verifierfile = ENV['SALT_KITCHEN_VERIFIER'] || '.kitchen/verifier.yml' %>
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-api.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-API" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-api \- salt-api Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-call.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-CALL" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cloud.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-CLOUD" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cp.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-CP" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-key.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-KEY" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-master.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-MASTER" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-minion.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-MINION" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-proxy.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-PROXY" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-PROXY" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-proxy \- salt-proxy Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-run.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-RUN" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-ssh.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-SSH" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-syndic.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-SYNDIC" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-unity.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT-UNITY" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt.1
View file
Open in desktop
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "May 07, 2018" "2017.7.6" "Salt"
.TH "SALT" "1" "Jun 14, 2018" "2017.7.7" "Salt"
.SH NAME
salt \- salt
.
Expand Down