valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,218 Commits 24 Branches 182 Tags 341 MiB
25b2ca677f
Commit Graph

140 Commits

Author SHA1 Message Date
Mathieu Parent
7ca2aa4919
Allow dynamic file_roots 
Fixes: #48132
 2019-02-06 21:33:11 +01:00
Erik Johnson
4a614775e4
Clarify documentation for the the gitfs "all_saltenvs" config param 2019-01-17 16:02:21 -06: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
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -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
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
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04: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
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
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-09 14:23:28 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-09 11:14:05 -06:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist 
These were overlooked a while back when we deprecated env in favor of
saltenv.
 2017-05-06 23:11:33 -05:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Erik Johnson
d6cd5056cf Enhance the Global Remotes docs 2017-05-02 16:37:56 -05:00
Erik Johnson
74ef0bf1d7 Clarify that it is only all_saltenvs which is new in Oxygen 
Depending on how you read it, the previous version may have suggested
that all of the per-remote parameters are new in Oxygen. This makes it
more explicit that the all_saltenvs param is the only one new to Oxygen.
 2017-05-02 09:10:21 -05:00
Erik Kristensen
fa1e56ad14 rename to all_saltenvs, add initial documentation 2017-05-01 08:56:18 -06:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -07:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-21 13:59:14 -07:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -07:00
Erik Johnson
7e1803b617 Update docs on upstream EPEL7 pygit2/libgit2 issues (#39421) 
pygit2 was rebuilt, but libgit2 still needs a rebuild. I opened an
upstream bug report this morning, this updates the docs to reflect the
current status of this upstream issue.
 2017-02-15 10:10:39 -07:00
Erik Johnson
fa3014393c Document the upstream RedHat bug with their pygit2 package (#39316) 
See https://github.com/saltstack/salt/issues/38630#issuecomment-274403448
 2017-02-10 16:09:35 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
 2017-02-09 10:29:40 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210) 
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
 2017-02-09 09:50:45 -07:00
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
SaltyCharles
e127013892 update gitfs.rst for clarity 
Add note for "Unsupported URL Protocol" error when using pygit2 without libssh2.
 2017-01-17 15:44:00 -08:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
 2016-12-19 14:58:39 -07:00
rallytime
02bfe7912c Remove more ":doc:" references from doc/* files 2016-12-15 15:36:44 -07:00
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871) 
Found using

find . -name '*.rst' | xargs igor -R -r
 2016-11-23 14:53:17 -07:00