valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,572 Commits 24 Branches 182 Tags 341 MiB
f18f2ee18c
Commit Graph

600 Commits

Author SHA1 Message Date
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains 2017-12-04 16:10:32 -05:00
Thomas S Hatch
4a808827c8 Add a default config entry to the master config 2017-11-29 17:14:17 -07:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains 2017-11-17 19:35:53 +01:00
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942 
Jinja line statements and comments
 2017-11-13 12:02:16 -08:00
Benedikt Werner
d568c73c76
Prepend root dir config to autosign_grains_dir 2017-10-29 13:53:55 +01:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +01:00
Benedikt Werner
53dd162729
Fixed grammar 2017-10-21 00:55:58 +02:00
Benedikt Werner
295b5d4834
Added tests and doc 2017-10-20 06:02:08 +02:00
Ronald van Zantvoort
e555b6351b doc fixes for salt-ssh roster(s) opts 2017-10-12 11:42:23 +02:00
Corvin Mcpherson
c67db52c73 Merge branch 'develop' into issue36942 2017-10-01 18:56:58 -04:00
Corvin Mcpherson
19dcfcf1a0 Add jinja_env and jinja_sls_env master configuration options documentation 2017-10-01 14:36:15 -04:00
Nicole Thomas
3f77571dad Merge branch 'develop' into high-out-by_id 2017-09-28 13:27:47 -04:00
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
garethgreenaway
7091f8ec71 Merge branch 'develop' into issue36942 2017-09-22 16:33:29 -07:00
Silvio Moioli
fd4194ade0 process_count_max: disable by default 2017-09-22 21:57:54 +02:00
Silvio Moioli
4d181ea523 process_count_max: add defaults and documentation 2017-09-22 21:57:02 +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
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Ken Jordan
ba0cdd4536 Fix phrasing for mine_interval description 2017-09-01 15:13:20 -06:00
Ken Jordan
9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. 2017-09-01 14:57:10 -06:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Corvin Mcpherson
78fd3f9b4d Merge branch 'develop' into issue36942 2017-08-17 16:18:46 -04:00
Corvin Mcpherson
2dc593b48e Add jinja environment default options. 2017-08-16 20:02:13 -04:00
Corvin Mcpherson
23e1b23925 Change jinja line statement and line comment prefix default to '' instead of None 2017-08-15 02:13:43 -04:00
Corvin Mcpherson
eb713c699f Add jinja line statement and line comment options to master config. 2017-08-14 19:56:34 -04:00
vernoncole
e970b0623a flesh out saltify driver 
(cherry picked from commit 0a730fb)
 2017-08-07 10:21:48 -06:00
Sigmon, Jeffrey
bb29afd022 Passphrase protect master private key 2017-07-27 13:17:26 -05:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
rallytime
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -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
Klaus Kämpf
0cf36b487b Run salt master as dedicated salt user 
* Minion runs always as a root
 2017-06-20 17:13:00 +01:00
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
 2017-06-19 14:17:01 -06:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -06:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
rallytime
cc07664a9f Replace Nitrogen with 2017.7.0 in remain directories 2017-06-14 12:18:37 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -06:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
Mike Place
3031a01266 Merge pull request #41021 from MTecknology/develop 
New feature: automatic job batching
 2017-05-05 10:20:04 -06:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
Michael Lustfield
49bd8bfed9 Fixing a spelling error. 2017-05-03 03:21:58 -05:00
Michael Lustfield
a4bae3cda9 Cleaning up (removing) use of safe_batch token. 2017-05-03 03:14:10 -05:00