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
95,907 Commits 24 Branches 182 Tags 341 MiB
f0cc183823
Commit Graph

842 Commits

Author SHA1 Message Date
Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3 
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py
 2018-11-14 10:33:44 -05:00
rallytime
66b078c1ab
Update the bootstrap script documentation to point to bootstrap repo 
This page is not updated very often and gets missed when various fixes/updates
go into the bootstrap script's repo. Instead of trying to maintain both pages,
the salt doc should have a general description with links to the bootstrap-repo
files.
 2018-11-12 15:38:09 -05:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-24 15:54:15 -04:00
Denys Havrysh
fe2d70d4a3
[DOC] Fix JSON payload example in HTTP tutorial 2018-10-22 18:57:04 +03:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Nicole Thomas
8e06471817
Merge pull request #48242 from asnell/asnell-patch-1 
Add sample list data via command line pillar
 2018-06-21 14:27:40 -04:00
asnell
f66bf60073
Add sample list data via command line pillar 2018-06-21 08:44:14 -04:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
Erik Johnson
24545204b3
Fix inaccurate gitfs_saltenv example in GitFS Walkthrough 2018-06-12 09:25:53 -05:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Erik Johnson
806ffb298a
Add masterless mode docs to gitfs tutorial 2018-05-08 13:46:47 -05:00
Cory Wright
9b7ee97d12
Fix copy/paste typo in minionfs tutorial 2018-04-13 11:52:41 -04: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
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Erik Johnson
2feaaa3efc
Fix invalid Sphinx lexers in docs 
This clears up some warnings when we build the docs, and improves the
syntax highlighting in the docs.
 2018-02-02 09:21:07 -06:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
 2018-01-23 13:26:43 -05:00
rallytime
e0ffa32b49
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/integration/modules/test_pkg.py
 2018-01-19 10:09:36 -05:00
Denys Havrysh
0d79b9eaff
[DOC] Suggest to upgrade pygit2 and deps 2018-01-17 15:24:15 +02:00
Erik Johnson
ef76bc6fcd
Update documentation for update intervals feature 2018-01-09 19:11:17 -06:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains 2017-12-04 16:10:32 -05:00
Eric Radman
bf9dc026bb
Update salt_boostrap command line help summary 
- Use exact indentation produced by the bootstrap-salt command
- normal package installs work fine on OpenBSD
 2017-12-01 15:28:09 -05:00
Mike Place
f2aa3539ef
Merge branch 'develop' into accept-minions-from-grains 2017-11-13 11:13:50 -07:00
Nicole Thomas
a29eeeec66
Fix a couple of small spelling errors 2017-11-07 12:16:28 -07:00
Thomas S Hatch
bed56e9dd7 make it clear that disableing the job cache is bad 2017-11-07 10:14:40 -07:00
Benedikt Werner
8f2693237c
Fixed and improved autoaccept grains docs 2017-10-29 14:02:36 +01:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +01:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/opkg.py
  - salt/utils/templates.py
  - tests/unit/templates/test_jinja.py
 2017-10-18 09:37:47 -04:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop' 
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
 2017-10-16 15:26:19 -04:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
Benedikt Werner
bc53598027
Fixed spelling mistake in salt_bootstrap tutorial 2017-10-10 19:03:07 +02:00
Benedikt Werner
6c30344824
Added missing tutorial docs to the tutorial index 2017-10-10 19:02:35 +02:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2 
Remove stormpath2
 2017-08-15 10:09:23 -04:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
rallytime
08bbcf5790 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-08-10 14:51:27 -04:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim 
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
 2017-07-24 12:17:41 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
Mike Place
df5a112a9b Merge pull request #41904 from twangboy/docs_win_add_firewall 
Fix anchor to _linux-iptables
 2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4 Fix anchor to _linux-iptables 2017-06-22 09:46:29 -06:00
Erik Johnson
1279f56c56 gitfs: Add two new options to affect saltenv mapping 
This adds 2 new config options:

- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored

It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
 2017-06-21 12:42:48 -05:00