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
70,912 Commits 24 Branches 182 Tags 341 MiB
54e5655e11
Commit Graph

6112 Commits

Author SHA1 Message Date
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-07-05 13:11:32 -06:00
rallytime
d850167efd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-06-30 16:11:04 -06:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
Mike Place
d4c04e07f0 Merge pull request #34358 from thatch45/thor_more 
Add Thorium states to auto clean out old keys
 2016-06-30 11:37:32 -07:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Thomas S Hatch
c6882ca974 suggest a sane default interval 2016-06-30 09:45:17 -06:00
Nicole Thomas
70e1f18b89 Beacon network docs (#34386) 
* Add beacons/network_settings to doc build

* Add a versionadded tag for the beacons.network_settings module
 2016-06-30 11:12:55 -04:00
Joseph Hall
fb3f05dfd7 Update dependency docs for SPM (#34385) 
* Update dependency docs for SPM

* Typo
 2016-06-30 11:12:26 -04:00
Thomas S Hatch
29b6253b3e Add all the things I always forget :) 2016-06-29 09:47:34 -06:00
Thomas S Hatch
d4d79d95ea update docs to a workign example 2016-06-28 21:19:52 -06:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
jacobhammons
0c60feac02 Doc clarifications to file modules, addition of new profile log level to docs, fixed example in dnsmasq (#34323) 
Refs #34249
Refs #34261
Refs #33694
Refs #34247
 2016-06-28 12:03:59 -04:00
Nicole Thomas
76c8bb0d1c Use correct feature branch name (#34317) 2016-06-27 18:26:19 -04:00
rallytime
f44a0543fe Fix test example in integration testing docs 
The example is out of date compared to the actual test it's modeling.

Notably, the self.state_result() function doesn't exist.
 2016-06-27 10:22:15 -06:00
Alexander Krasnukhin
a8514d9058 Update correct default value for spm_build_dir 
Looks like docs have wrong default directory for `spm_build_dir` config option. It is actually `/srv/spm_build`.
 2016-06-27 13:11:23 +02:00
Seth House
6639b347d0 Add 'delete' key event to list (#34189) 2016-06-22 11:23:49 -04:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 16:03:31 -06:00
Mike Place
3413c494bd Merge pull request #34173 from rallytime/fix-34162 
Update docs to match log_level default
 2016-06-21 10:15:53 -07:00
Nicole Thomas
47595d6795 Typo fix (#34174) 2016-06-21 12:08:43 -04:00
rallytime
f577681f0b Update docs to match log_level warning default 
Fixes #34162
 2016-06-21 09:31:59 -06:00
rallytime
73f3e12ce6 Update package dep note to systemd-python for RHEL7 install 
Fixes #34120
 2016-06-20 08:53:42 -06:00
Metin de Vreugd
d1769fb64f Add timeout to ddns execution module and runner 2016-06-20 11:08:10 +02:00
rallytime
d957c29704 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/utils/parsers.py
 2016-06-16 17:08:39 -06:00
rallytime
f6bfaede21 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/installation/index.rst
  - salt/master.py
  - salt/modules/mac_brew.py
  - salt/modules/pacman.py
  - salt/modules/solarisips.py
  - salt/returners/postgres_local_cache.py
  - salt/states/apache_module.py
  - salt/utils/minions.py
  - tests/unit/acl/client_test.py
 2016-06-16 16:10:41 -06:00
Thomas S Hatch
dd26d6fd74 Merge pull request #34009 from rallytime/bp-33948 
Back-port #33948 to 2016.3 + add log message
 2016-06-16 15:01:09 -06:00
Anthony Elizondo
2d7ce4cde1 Typo fix (#34066) 2016-06-16 15:04:04 -04:00
Jacob Hammons
ce027fd769 Fixes doc refresh bug on chrome mobile. 2016-06-16 12:43:33 -06:00
Thomas S Hatch
bf3e7c83b0 Merge pull request #33837 from lorengordon/masterless-orchestration 
Support salt.state orchestration in masterless mode
 2016-06-16 11:16:53 -06:00
Thomas S Hatch
dd03024931 Merge pull request #34011 from rallytime/bp-33948-2015.8 
Back-port #33948 and #34009 to 2015.8
 2016-06-16 09:41:01 -06:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
Jacob Hammons
cf0d14d6d6 Updated latest version for doc site 2016-06-15 13:23:50 -06:00
Jacob Hammons
43b4a12aa2 Updated latest release version 2016-06-15 13:22:06 -06:00
Loren Gordon
363d175fb7 Documentation to describe orchestration support for masterless minions 2016-06-15 14:12:53 -04:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1 
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
 2016-06-15 11:52:02 -06:00
rallytime
78befde62f Add note to release notes about returner minions kwarg change 2016-06-14 12:51:44 -06:00
rallytime
c776d2d795 Add note to release notes about returner minions kwarg change 2016-06-14 10:33:41 -06:00
Mike Place
1132bc5d0b Merge pull request #33995 from jacobhammons/doc-fixes 
Understanding Jinja topic, Jinja doc issues.
 2016-06-13 19:00:29 -07:00
Mike Place
a400f6a6c3 Merge pull request #33900 from amendlik/gitfs-hook-doc 
Document sudo policy for gitfs post-recieve hook
 2016-06-13 18:04:35 -07:00
Mike Place
d8d2b2ee9e Merge pull request #33919 from thatch45/cmd_filter 
Cmd filter
 2016-06-13 18:03:21 -07:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues. 
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
 2016-06-13 18:30:42 -06:00
Jacob Hammons
b20213fd79 Adds links to several current Salt-related projects 
Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file
Adds a note about Salt Pack to the installation doc
 2016-06-13 17:11:36 -06:00
Adam Mendlik
b4a28e2684 Add clarifying documentation about the need for sudo in the git hook 2016-06-13 13:22:39 -06:00
Thomas S Hatch
017cb39c5d Adress issues 2016-06-13 11:21:22 -06:00
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/boto_lambda.py
 2016-06-13 11:18:53 -06:00
rallytime
19d49d94f2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-13 11:13:38 -06:00
Thomas S Hatch
a9c304c73b Merge pull request #33948 from cachedout/optimize_save_load 
Save an entire minion cache traversal on each master pub
 2016-06-13 09:57:57 -06:00
Mike Place
18df7263ac Merge pull request #33955 from adamchainz/readthedocs.io 
Convert readthedocs links for their .org -> .io migration for hosted projects
 2016-06-13 08:49:35 -07:00