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
84,552 Commits 24 Branches 182 Tags 341 MiB
a1946730a9
Commit Graph

7562 Commits

Author SHA1 Message Date
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-12-20 10:26:10 -05:00
Vernon Cole
0bdb46dab9
add clouds modules to index 2017-12-20 06:58:09 -05:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-12-16 08:16:23 -05:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/grains/test_core.py
 2017-12-12 15:24:30 -05:00
mvivaldi
d23ac4eabc Fix for the jinja documentation 2017-12-12 17:35:46 +01:00
mvivaldi
62409d608a Added Escape Filters and Set Theory Filters in jinja documentation 2017-12-09 09:48:55 +01:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/reg.py
  - salt/modules/state.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_file.py
  - tests/integration/output/test_output.py
  - tests/unit/grains/test_core.py
 2017-12-01 11:12:44 -05:00
chris ruscio
e2682bf441 Fix minion ping_interval documentation 2017-11-30 13:56:10 -05:00
Mircea Ulinic
f8d69dd0ba
Add thorium_roots configuration example 2017-11-30 12:50:29 +00:00
Mircea Ulinic
4610fb4e62
thorium_roots not thorium_roots_dir 2017-11-30 12:48:17 +00:00
Gareth J. Greenaway
998d714ee7
Merge pull request #44517 from whytewolf/publish_port_doc_missing 
Publish port doc missing
 2017-11-28 13:50:18 -08:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file 
Update notes around grains topic, and salt.modules.grains and salt.state.grains
 2017-11-27 16:33:37 -05:00
Nicole Thomas
9ea4ee1479
Merge pull request #44549 from cloudflare/fix-proxy-grains 
Allow proxy minions to load static grains
 2017-11-27 15:57:08 -05:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored. 
only those set in the minion config

also update header of salt.modules.grains to more closely match what
states says in regard to this.

and tweak the note portion to stand out a bit more.

tweaked the state note to also stand out more
 2017-11-22 15:17:45 -08:00
rallytime
90d1cb221d
Add documentation about logging before modules are loaded 2017-11-20 09:05:49 -05:00
Mircea Ulinic
0320174ea4
Add doc note regarding static grains on proxy minions 2017-11-15 13:19:03 +00:00
Nicole Thomas
91d46d4cfc
Merge pull request #44434 from whytewolf/1837 
add a note that describes grain rebuilding on restart and refresh
 2017-11-14 06:21:53 -05:00
Thomas Phipps
d148e39dda
change from md to rst for code reference 2017-11-13 15:15:13 -07:00
Thomas Phipps
4b5855283a
missed one place where i didnt chanbge master_port from my copy to publish_port 2017-11-13 12:21:34 -07:00
Thomas Phipps
e4610baea5
update doc to have publish port 2017-11-13 12:14:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout 2017-11-13 11:49:30 -07:00
Thomas Phipps
7256fcc1c9
update note to take into account grains_cache 2017-11-08 16:36:38 -08:00
Thomas Phipps
9cdeb4e903
update log-granular-levels to describe what they are filtering on 2017-11-08 16:11:46 -08:00
Nicole Thomas
dcdf2d4c90
Merge pull request #44429 from Ch3LL/orch_doc 
Fix orch doc from pillat.get to pillar.get
 2017-11-07 16:06:38 -07:00
Thomas Phipps
aca0405b26 add a note that describes grain rebuilding on restart and refresh 2017-11-07 14:51:32 -08:00
Ch3LL
38ca5520f0
Fix orch doc from pillat.get to pillar.get 2017-11-07 11:36:10 -05:00
rallytime
edbbd5fc2b
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - .kitchen.yml
  - salt/modules/win_system.py
 2017-11-05 20:56:44 -07:00
Rossen Georgiev
b18f2e5a6d fix program name and description for --static 2017-10-30 15:10:11 +00:00
Rossen Georgiev
5b10918f02 updated CLI docs for salt-ssh 2017-10-28 10:54:47 +01:00
David Boucha
c919648ab4
Fix documentation grammar and spelling errors 2017-10-25 17:24:26 -06:00
Nicole Thomas
6252f82f58 Merge pull request #44133 from cachedout/fix_paralell_docs 
Fix typos in parallel states docs
 2017-10-17 11:24:18 -04:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs 2017-10-16 16:43:10 -06:00
Nicole Thomas
2fba45cd3f Merge pull request #44125 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.2 to 2017.7
 2017-10-16 16:02:24 -04:00
Nicole Thomas
888e5f51a2 Merge pull request #44121 from benediktwerner/2017.7 
Fixed code snippet in unit testing documentation
 2017-10-16 14:28:36 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.2.rst
 2017-10-16 13:53:13 -04:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc 2017-10-16 17:23:23 +02:00
rallytime
bbec47afbc
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/aws.py
 2017-10-16 08:57:50 -04:00
Nicole Thomas
a85837d72b Merge pull request #44066 from Ch3LL/cherry_release 
Add Known CherryPy Issue to 2017.7.2 Release Notes
 2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes 2017-10-12 09:33:59 -04:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
David A. Pocock
385980c21a
Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo 2017-10-10 15:06:18 -05:00
David A. Pocock
266dc00a23
Typo correction of lover to lower 2017-10-10 15:04:00 -05:00
Nicole Thomas
d61300df20 Merge pull request #44023 from Ch3LL/11.9rn 
Add 2016.11.9 Release Note File
 2017-10-10 16:03:01 -04:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File 2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File 2017-10-10 15:31:19 -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
Mike Place
e434c39c4e Merge pull request #43960 from cro/ldap_nopw_bind2 
Require that bindpw be non-empty when auth.ldap.anonymous is False
 2017-10-09 17:09:01 -06:00
garethgreenaway
e9dfda2177 Merge pull request #43991 from Ch3LL/3.8_sec_2 
Add Security Notes to 2016.3.8 Release Notes
 2017-10-09 15:00:24 -07:00