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
78,473 Commits 24 Branches 182 Tags 341 MiB
bb622a68b2
Commit Graph

4206 Commits

Author SHA1 Message Date
Brad Davis
bb622a68b2 Further explain the additional function arguments and where to find them 2017-02-21 11:39:03 -07:00
Brad Davis
1356dd6cc0 Explain where the functions available as mine_functions come from. 2017-02-21 11:37:12 -07:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Mike Place
bf68f9c73c Merge pull request #39404 from Mac21/add-subnets-cloud-gce 
Add subnetwork support to GCE Cloud Module.
 2017-02-17 11:40:46 -07:00
toller
3ab83e5d94 Fix documentation about deleting subnetwork and network when recources are using them. 2017-02-17 09:53:03 -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
Megan Wilhite
1acf00da3b add 2016.11.3 changelog to release notes (#39451) 2017-02-16 10:49:53 -07:00
Mike Place
8e2cbd2307 Merge pull request #39448 from gtmanfred/2016.11 
Add release notes for cisco proxy minions added in Carbon
 2017-02-16 10:29:47 -07:00
Daniel Wallace
3172e88700 Add release notes for cisco proxy minions added in Carbon 2017-02-16 10:05:33 -06:00
Ari Maniatis
4af0514def Improve introduction to explain the purpose of orchestration 
Before diving into technical details tell the user why they want this feature.
 2017-02-16 18:52:05 +11: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
toller
2cc6ce7b51 Add subnetwork support to GCE Cloud Module. 
Implements #39258
 2017-02-14 12:48:57 -07:00
Elias Probst
2021f5b537 Add creation/configuration of Salt PKI dirs to hacking docs (#39341) 2017-02-13 09:39:42 -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
c1df446b7a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/returners/postgres.py
  - salt/returners/postgres_local_cache.py
 2017-02-10 10:18:26 -07:00
rallytime
0b8dddf12b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-02-10 08:24:51 -07:00
markuskramerIgitt
2a40840421 rst table requires + signs for column 2017-02-10 12:33:57 +01:00
markuskramerIgitt
7e25c637d9 wrong git branch 2017-02-10 12:29:13 +01:00
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00
Mike Place
fc551bcf5d Merge pull request #39293 from sergeizv/grammar-fix 
Grammar fix
 2017-02-09 15:49:10 -07:00
Mike Place
8a1b45632a Merge pull request #39295 from sergeizv/typo-fix 
Fix typo
 2017-02-09 15:48:58 -07:00
Mike Place
1d813bd902 Merge pull request #39283 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-09 15:10:03 -07:00
Mike Place
5caa083024 Merge pull request #39250 from Juniper/develop 
junos specific changes to add more feature and enhancements to our APIs
 2017-02-09 14:49:09 -07:00
Erik Johnson
fbd551e069 Add note about using saltenv jinja var in pillar top files 
This adds some useful information to the pillar docs.
 2017-02-09 14:39:09 -06:00
Sergei Zviagintsev
04bde6eed2 Fix link in proxyminion guide 2017-02-09 19:18:13 +01:00
Sergei Zviagintsev
5d9f36d58d Fix typo 
manor -> manner
 2017-02-09 19:16:08 +01:00
Sergei Zviagintsev
70f2b586d3 Rewrap paragraph 
Rewrap the paragraph to fit in 80 chars line. The contents isn't
changed.
 2017-02-09 19:13:01 +01:00
Sergei Zviagintsev
e6ab5178ea Grammar fix 
Use 'if' instead of 'in case'
 2017-02-09 19:02:29 +01: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
vnitinv
3d9dd685f5 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-08 23:06:48 +05:30
Marc-Aurèle Brothier
2c3ab01811 Add link in toc for cloudstack page 2017-02-08 14:03:31 +01:00
Mike Place
d5d39321c8 Merge pull request #37808 from cloudflare/JINJA-FILTERS 
Jinja filters
 2017-02-07 14:52:23 -07:00
Mike Place
0f838b2b12 Merge pull request #38621 from terminalmage/pr34442 
Add support for wildcard versions in pkg.installed states
 2017-02-07 14:41:14 -07:00
Mike Place
9863b24136 Merge pull request #39196 from carlpett/patch-3 
Clarify where sdb profiles need to be configured
 2017-02-07 09:45:09 -07:00
Erik Johnson
18729f3713 Add wildcard versions to Nitrogen release notes 2017-02-07 08:54:26 -06:00
vnitinv
e48fff4192 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-07 11:27:43 +05:30
Nitin Kumar
49b9f00643 Merge branch 'develop' into develop 2017-02-07 11:14:25 +05:30
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Marc-Aurèle Brothier
786948ca98 Doc: add getting started page for CloudStack provider based on Exoscale as an example 
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
 2017-02-06 21:13:38 +01:00
rallytime
7ea5f7f82f Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-02-06 12:33:52 -07:00
Mike Place
f8d79076f2 Merge pull request #39013 from terminalmage/zh878 
Decryption of values in Pillar SLS files
 2017-02-06 12:08:57 -07:00
Calle Pettersson
5a017d733b Clarify where sdb profiles need to be configured 2017-02-06 19:46:33 +01:00
Mike Place
b0ea6d74c9 Merge pull request #39099 from cloudflare/JINJA-LOG 
Log module
 2017-02-06 11:40:11 -07:00
Mike Place
d56cc4d3fc Merge pull request #39167 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-06 11:27:36 -07:00
Inveracity
1962c778bd update GCE docs adding subnetwork parameter 
Updating docs to reflect merge #39072
 2017-02-05 12:12:35 +01:00
rallytime
5aeddf42a0 Restore "Salt Community" doc section 
This was moved to the `topics/index.rst` page in PR #10792, but
seems to have been accidentally removed in PR #30770.
 2017-02-03 16:43:04 -07:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-03 10:58:55 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
 2017-02-03 09:48:58 -07:00