valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,894 Commits 24 Branches 182 Tags 341 MiB
8ded32b84a
Commit Graph

8249 Commits

Author SHA1 Message Date
rallytime
8ded32b84a
Remove deprecated monggodb_database state 
All functions in the mongobd_database state was deprecated and marked for
removal in the Fluorine release. Since no functions would remain in the state,
the state has been removed.
 2018-03-13 13:49:20 -04:00
rallytime
2e3bc07cf2
Remove deprecated mongodb_user state 
All functions in the mongobd_user state were deprecated and marked for removal
in the Fluorine release. Since no functions would remain in the state, the
state has been removed.
 2018-03-13 13:43:10 -04:00
rallytime
cf44199305
Remove deprecated k8s state 
All functions in the k8s state were deprecated and marked for removal in the
Fluorine release. Since now functions would remain in the state, the state
has been removed.

Fixes #46476
 2018-03-12 17:22:04 -04:00
Nicole Thomas
b3c8537f93
Merge pull request #46495 from rallytime/fix-46474 
Remove deprecated syntax for roster_order in roster/cache.py
 2018-03-12 16:27:53 -04:00
rallytime
194c9c12e9
Remove deprecated syntax for roster_order in roster/cache.py 
Fixes #46474
 2018-03-12 13:23:31 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-03-12 11:53:21 -04:00
nicholasmhughes
f82367289e
added the ability to send salt keys to the userdata script 2018-03-12 09:11:37 -04:00
Nicole Thomas
bd6eafa22a
Merge pull request #46458 from brejoc/patch-3 
Fixed typo
 2018-03-09 09:30:01 -05:00
Nicole Thomas
33e9630cea
Merge pull request #46460 from ryanwalder/fix-mine-doc 
[Docs] Clarify `mine_interval` setting location in mine docs
 2018-03-09 09:28:24 -05:00
Jochen Breuer
58836993dd
Fixed typo 
I think this should be whether instead of wither.
 2018-03-09 10:03:50 +01:00
David Boucha
ff81291d0b fix typo 2018-03-08 15:34:43 -07:00
David Boucha
250086ae2a Add minion startup event change to release notes 2018-03-08 15:34:43 -07:00
David Boucha
391be5c06c Add docs for turning off extra startup msgs 2018-03-08 15:34:43 -07:00
David Boucha
27c3214461 Use new style event tags 2018-03-08 15:34:43 -07:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Ryan Walder
b9c9d2d747 Clarify mine_interval setting location in min docs 
Needs clarification pointing direct to the minion config as it follows
config that can be in wither pillar or config which can be confusing.

Especially to me :D
 2018-03-08 16:30:36 +00:00
rallytime
ddbeef85cd
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/payload.py
  - salt/utils/schedule.py
 2018-03-06 16:57:33 -05:00
sumeetisp
c9127712d2
Change in profile parameter as per code 
In the code, del_all_vols_on_destroy is used and in documentation del_all_vol_on_destroy has been used. Hence there is a mismatch.
 2018-03-06 13:15:46 +05:30
Erik Johnson
0411845cec
Update the merge-forward docs to reference the 2018.3 branch 
This will make the docs for 2018.3.x more coherent once the docs for
2018.3 are pushed live.
 2018-03-05 10:04:30 -06:00
Erik Johnson
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3 
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
 2018-03-02 16:20:20 -06:00
Nicole Thomas
5f88d64dc0
Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules 
Add Additional Azure ARM Modules
 2018-03-02 16:49:07 -05:00
Nicole Thomas
d1d966abc7
Merge pull request #46302 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-02 16:27:45 -05:00
Ch3LL
52a68450ae
Update releasecandidate doc for 2018.3.0rc1 2018-03-02 12:02:21 -05:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
rallytime
18eca3da3b
Port 2018.3.0.rst release note changes to develop 2018-03-01 14:24:10 -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
Nicole Thomas
1bb4ef6bc8
Merge branch 'develop' into add-additional-azurearm-modules 2018-02-28 14:13:39 -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
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
Denys Havrysh
d702846961
[DOC] Replace note rST block for GitHub 2018-02-27 16:53:39 +02:00
rallytime
6927642321
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-02-26 14:23:06 -05: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
Megan Wilhite
78671738ff
Merge pull request #46134 from rallytime/develop_update_version_doc 
Update release versions for the develop branch
 2018-02-26 11:42:32 -05:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
Nicole Thomas
f9408cec52
Merge pull request #46102 from mephi42/develop 
Allow configuring HTTP connect timeout
 2018-02-26 10:15:06 -05:00
nicholasmhughes
2f984d7260
updated required azure module versions 2018-02-25 12:42:40 -05:00
mephi42
46996178e2
Allow configuring HTTP connect timeout 2018-02-24 13:21:26 +01:00
Nicole Thomas
8aaac011b4
Merge pull request #45905 from jasperla/pf 
add execution module for OpenBSD Packet Filter
 2018-02-23 14:28:17 -05:00
Nicole Thomas
606d70c521
Merge pull request #45945 from xyoun/develop 
pip.list_all_versions now can read index_url
 2018-02-23 14:23:48 -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
a731047e59
Add man pages for oxygen release 2018-02-23 12:15:13 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145 
Back-port #46145 to oxygen.rc1
 2018-02-22 16:57:51 -05:00
Jasper Lievisse Adriaanse
a973b70d64
add execution module for OpenBSD Packet Filter 2018-02-22 21:08:35 +01:00
Erik Johnson
6a8b1ac33a
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-22 10:49:39 -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
c77341b544
Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree 2018-02-21 21:56:54 -06:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00