valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,990 Commits 24 Branches 182 Tags 341 MiB
54e9bf9ec9
Commit Graph

7670 Commits

Author SHA1 Message Date
rallytime
1503f1020f
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-14 10:56:21 -04:00
Mike Place
6d2ddd050f
One more grammar fixup 2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix 2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases 2018-05-11 09:51:50 -04:00
Erik Johnson
806ffb298a
Add masterless mode docs to gitfs tutorial 2018-05-08 13:46:47 -05:00
rallytime
48ecb78dec [2017.7.6] Update man pages 2018-05-07 20:31:38 +00:00
Nicole Thomas
e8c4524bae
Merge pull request #47455 from Ch3LL/unreleased_rn 
Add In Progress Warning for 2017.7.6 Release Notes
 2018-05-04 09:44:54 -04:00
Erik Johnson
6d7803ece0
Fix docs build on Sphinx 1.7+ 
Sphinx 1.7 got rid of sphinx.utils.compat. This commit allows the builds
to work both on both older and newer Sphinx.
 2018-05-03 13:31:34 -05:00
Ch3LL
b6d0cc2ab7
Add In Progress Warning for 2017.7.6 Release Notes 2018-05-03 12:06:15 -04:00
Daniel Wallace
6214ed8133
add mention of the formulas channel to the formulas docs 2018-04-27 08:45:10 -05:00
Mike Place
33c0644ac4
Credit Frank Spierings 2018-04-26 11:29:51 -05:00
Banio Carpenter
b97c9df5f3 added clarity on how to figure out what is the oldest supported main release branch 2018-04-25 10:59:22 -05:00
Ch3LL
fa4c2e6575
Update Docs to remove unnecessary + sign 2018-04-23 15:35:04 -04:00
Ch3LL
24dea24b7e
Add CVE number to 2016.3.6 Release 2018-04-23 15:03:48 -04:00
rallytime
0039395017
Updage jenkins module autodocs to use jenkinsmod name instead 
Refs #46801

The jenkins module was renamed to jenkinsmod recently, but the autodoc
files were never updated.

We need to remove the jenkins.py docs from the docbuild server, but we
can't do that if the new docs for jenkinsmod.py aren't building yet.

This PR updates the autodoc files to point to the new file.
 2018-04-18 15:14:30 -04:00
twangboy
6635b9003f
Fix winrm powershell script 
Removes the `Hostname` paramater in the winrm create command. It is not
needed. It must match the hostname on the certificate, which is not
defined in the case of the Remote Desktop certificate
Removes extra spaces
 2018-04-12 14:41:19 -06:00
Denys Havrysh
bfdf54e61d
[DOC] Fix Jinja block in FAQ page 
Closes #18835
 2018-04-08 12:19:48 +03:00
Megan Wilhite
307e7f35f9
Merge pull request #46740 from rallytime/2017.7_update_version_doc 
Update release versions for the 2017.7 branch
 2018-04-03 10:36:06 -04:00
rallytime
7edf98d224
Update 2018.3.0 information and move branch from "latest" to "previous" 2018-04-02 15:05:36 -04:00
Denys Havrysh
a1cc55da3d
[DOC] Remove mentions of COPR repo from RHEL installation page 
Fixes #28142
 2018-03-28 12:30:07 +03:00
rallytime
5336e866ac
Update release versions for the 2017.7 branch 2018-03-27 14:25:16 -04:00
Denys Havrysh
d0929280fc
[DOC] Update FAQ about Salt self-restarting 
Fixes #5721
 2018-03-26 23:38:45 +03:00
Nicole Thomas
fadc5e4ba4
Merge pull request #46669 from terminalmage/pillar-merge-order 
Add option to return to pre-2017.7.3 pillar include merge order
 2018-03-26 15:00:27 -04:00
Erik Johnson
b4a1d34b47
Add option to return to pre-2017.7.3 pillar include merge order 
https://github.com/saltstack/salt/pull/45025 changed the pillar include
merge order. This adds a new config option which allows a user to revert
to the pre-2017.7.3 behavior.
 2018-03-22 13:35:12 -05:00
Denys Havrysh
51e6aa54a1
[DOC] Unify cloud modules index header 2018-03-21 17:17:28 +02:00
Ch3LL
6076bfa2ee
Add changelog to 2017.7.5 release 2018-03-19 16:36:41 -04:00
rallytime
782a5584f5
Update man pages for 2017.7.5 2018-03-13 12:47:40 -04:00
Nicole Thomas
c7f95581e3
Merge pull request #46449 from bdrung/make-doc-theme-configurable 
Make documentation theme configurable
 2018-03-09 12:47:14 -05:00
Nicole Thomas
a188984cd9
Merge pull request #46446 from bdrung/fix-typos 
Fix various typos
 2018-03-08 16:11:46 -05:00
Benjamin Drung
4a5da2d144 Make documentation theme configurable 
Debian uses the previous documentation theme. Make the documentation
theme configurable via an environment variable HTML_THEME.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 16:56:12 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
Benjamin Drung
584b451fd1 Support dynamic pillar_root environment 
Allow users to specify a __env__ pillar_root directory that applies
equally to all environments that are not explicitly specified.

fixes #20581
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 10:12:40 +01:00
Ch3LL
158add6661
change oxdownload to oxdownload-{python_version} 2018-03-06 11:12:42 -05:00
Ch3LL
21aa848c89
Add mac py2 and py3 packages to mac installation docs 2018-03-06 11:09:33 -05:00
Nicole Thomas
8e8a3a2897
Merge pull request #46261 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-03-01 12:55:22 -05:00
Nicole Thomas
509429f08c
Merge pull request #46260 from terminalmage/git_pillar 
Normalize global git_pillar/winrepo config items
 2018-02-28 17:05:25 -05:00
rallytime
8256ae5ee5
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-28 14:59:01 -05:00
Erik Johnson
b1ce2501fd
Normalize global git_pillar/winrepo config items 
We were only normalizing the global version of a config parameter if it
had a per-remote counterpart. This was all well and good for gitfs,
which doesn't have any config values that are global-only, but
git_pillar and winrepo have config params which are global-only, and
they were therefore not being normalized.

This fixes that oversight, and also makes a few other changes in
salt.utils.gitfs to ensure that we're not pulling from the un-normalized
values from the opts dict, when we need to fall back to global defaults.

Additionally, it fixes an issue in which the `git_pillar_branch` config
item was overriding the branch set in a git_pillar remote.
 2018-02-28 13:07:11 -06:00
rallytime
f5fae3dedf
Update enterprise banner 
(removes 5.0 text)
 2018-02-28 11:55:16 -05:00
rallytime
07ed8c7db3
Update docbanner for SaltConf18 2018-02-28 11:42:43 -05:00
Denys Havrysh
d702846961
[DOC] Replace note rST block for GitHub 2018-02-27 16:53:39 +02:00
Ch3LL
6ddf3246ce
Add 2017.7.5 Release Notes File 2018-02-26 14:22:20 -05:00
Megan Wilhite
c8c71e75ca
Merge pull request #46133 from rallytime/2017.7_update_version_doc 
Update release versions for the 2017.7 branch
 2018-02-26 11:42:42 -05:00
Nicole Thomas
705caa8cca
Merge pull request #46148 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-02-23 14:21:38 -05:00
rallytime
25deebf7a6
Merge branch '2017.7.3' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-02-22 10:22:22 -05:00
Erik Johnson
f9301fcc34
Document behavior when orchestration runnner invoked with non-orch states 
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
 2018-02-21 20:36:30 -06:00
Denys Havrysh
d8fb051e44
[DOC] Fix code-blocks for reStructuredText 2018-02-21 15:37:57 +02:00
rallytime
0ed338e643
Update release versions for the 2017.7 branch 2018-02-21 06:37:22 -05:00
rallytime
d2196b6df3
Update release versions for the 2016.11 branch 2018-02-21 06:37:18 -05:00
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-20 17:43:33 -05:00