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
71,479 Commits 24 Branches 182 Tags 341 MiB
1c5dacdb00
Commit Graph

6148 Commits

Author SHA1 Message Date
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Thomas S Hatch
94df6f8dc6 Add a clarifying note on Saltfile 2016-07-21 11:09:28 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
C. R. Oldham
bf4dc079df Document fqdn_base. 2016-07-18 15:49:59 -06:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756) 
adds link to all tutorials to using salt section
Refs #33923
 2016-07-18 15:36:50 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure 
Refs #27980
 2016-07-18 11:26:36 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-18 09:45:00 -06:00
Mike Place
c6700a219a Document how to test for the existence of a log message (#34738) 2016-07-18 09:12:13 -06:00
Mike Place
abf5b976ed Merge pull request #34722 from rallytime/fix-34630 
Various spelling fixes
 2016-07-16 13:49:54 -06:00
rallytime
b9e0bd1918 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-16 13:24:10 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-16 12:29:54 -06:00
Denys Havrysh
a8b79e8dc1 event_return_* master opts: update doc and config examples 
Signed-off-by: Denys Havrysh <Denys.Gavrysh@gmail.com>
 2016-07-15 15:27:48 +03:00
rallytime
f20e78b534 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 15:35:21 -06:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
Mike Place
07840714c5 Merge pull request #34608 from pass-by-value/cassandra_cql_returner_opts 
Add support for more options to Cassandra CQL returner
 2016-07-14 09:06:43 -06:00
Fred Damstra
d75276f9d9 Added documentation link for rawfile_json returner. 2016-07-13 20:34:27 -04:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Jacob Hammons
5e2ddb5eb0 Adds a mock required for the network settings beacon 2016-07-12 13:08:46 -06:00
Aditya Kulkarni
857208394f Add support for more options to Cassandra CQL returner 2016-07-12 11:50:01 -04:00
Loren Gordon
bfe0dd0b8a Clarifies the proper way to reference states 
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
 2016-07-12 07:58:27 -04:00
Christer Edwards
220a3ae53f Update freebsd.rst 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-07-10 10:22:30 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix 
Use -O in the wget example in the bootstrap tutorial for the develop branch
 2016-07-07 10:30:46 -06:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-07-05 13:11:32 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04: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