C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
dsumsky
6d797f50d4
- log_level_logfile and log_level configuration options inheritance docu updated
2015-02-12 19:47:59 +01:00
Thomas Jackson
da3ea213e9
Comma cleanup
2014-12-12 11:34:34 -08:00
Thomas Jackson
f268bb8b4b
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas S Hatch
3cf0cfb61d
Merge branch '2014.7' into develop
2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69
Add further clarification that gitfs auth is pygit2-only
2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d
Merge branch '2014.7' forward into develop
...
Conflicts fixed.
Conflicts:
salt/loader.py
salt/returners/carbon_return.py
salt/returners/couchbase_return.py
salt/returners/couchdb_return.py
salt/returners/elasticsearch_return.py
salt/returners/local_cache.py
salt/returners/memcache_return.py
salt/returners/mongo_future_return.py
salt/returners/mongo_return.py
salt/returners/mysql.py
salt/returners/odbc.py
salt/returners/postgres.py
salt/returners/redis_return.py
salt/returners/smtp_return.py
salt/returners/sqlite3_return.py
salt/states/dockerio.py
salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Erik Johnson
bb6de490ef
Grammar correction
2014-10-15 22:36:12 -05:00
Mike Place
d0e90c77a6
Typo fix
2014-10-14 13:18:54 -06:00
Mike Place
0fcc0b5ae7
Document pillar ovewrite strategy
2014-10-14 13:07:26 -06:00
Mike Place
11ef20fdf5
Small doc fixes
2014-10-09 10:14:37 -06:00
Chris Rebert
5ec98a7c4f
fix typos in doc/ref/configuration/master.rst
2014-10-01 14:06:11 -07:00
Thomas Jackson
6225ae5145
Remove "never timeout" feature
2014-09-23 14:13:44 -07:00
Thomas Jackson
2075fcde77
Update docs
2014-09-23 14:13:35 -07:00
Thomas Jackson
4fac8f7d22
Add master_id to master docs
2014-09-23 14:11:51 -07:00
vs
94948047cf
add rotate_aes_key documentation to master-configuration reference
2014-09-22 14:43:59 -06:00
Thomas S Hatch
d88ceab872
Merge pull request #15917 from felskrone/fix_key_rotation
...
Rename key_no_rotate to rotate_aes_key
2014-09-18 14:14:18 -06:00
vs
ae07fe381b
add documentation for the con_cache setting in master config
2014-09-18 14:26:49 +02:00
vs
da78c38b97
add rotate_aes_key documentation to master-configuration reference
2014-09-18 13:57:38 +02:00
Erik Johnson
13cc497b36
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Colton Myers
bb24131750
Merge branch '2014.7' into develop
2014-09-05 11:57:57 -06:00
Thomas S Hatch
71c9bf4708
Add docs for roster_file option
2014-09-05 11:55:11 -06:00
Nitin Madhok
0e61c4125d
Fixing sphinx violation and warning
2014-09-03 15:22:26 -04:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
a3c62ef119
Add default value for fileserver_backend
2014-09-02 14:35:03 -05:00
Erik Johnson
6e98ef828d
gitfs_provider has no default value
2014-09-02 13:22:47 -05:00
Scott Coil
6770ce314e
add ability to target pillar from ext pillar
2014-08-31 16:46:22 -05:00
Chris Rebert
a53ae15d23
copyedits
2014-08-22 11:59:13 -07:00
Thomas S Hatch
f0009be6c2
Merge branch '2014.7' into develop
2014-08-21 17:20:26 -06:00
Thomas S Hatch
2d47589c88
Merge pull request #15140 from terminalmage/pygit2-auth
...
Add gitfs authentication support for pygit2>=0.20.3
2014-08-21 15:03:35 -06:00
Seth House
4abc45397d
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-08-21 13:23:52 -06:00
Erik Johnson
c8be676577
Update gitfs documentation
...
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
2014-08-20 21:36:44 -05:00
Mike Place
94543fe68d
Document seco range
...
Per request in #15093
2014-08-20 11:54:29 -06:00
Seth House
c9390ebb00
Merge pull request #14907 from cachedout/doc_master_proc
...
Explain the number of master procs and worker_threads
2014-08-11 18:26:23 -04:00
Seth House
b5bf67fdd1
Merge branch 'copyediting' of https://github.com/hulu/salt into develop
...
Conflicts:
salt/states/win_update.py
2014-08-11 18:23:44 -04:00
Mike Place
a352cc4521
Explain the number of master procs and worker_threads
...
Refs #13819
2014-08-11 16:09:02 -06:00
Chris Rebert
75d28df71d
Begone, "allows to" (sic) !
2014-08-11 10:20:28 -07:00
Nitin Madhok
e7bea7cc87
Fixing sphinx Warnings and Errors
2014-08-11 10:20:15 -04:00
Jeff Schroeder
b0467e2265
Add version added for pillar_source_merging_strategy
...
Some of my coworkers tried to use this feature and realized it isn't available. git tag --contains for the commit which adds it shows:
$ git tag --contains 3b9891b1
2014-08-07 15:30:24 -05:00
Thomas Jackson
0ce353ddfb
Add master_id to master docs
2014-08-01 16:38:22 -07:00
rallytime
a8cd830d52
Change "Helium" to 2014.7.0 in affected docs
2014-07-15 16:53:29 -06:00
Volker Schwicking
f3d6c705ee
add settings multimaster-pki
2014-07-15 12:09:52 +02:00
Thomas S Hatch
1577bf0fad
Merge pull request #14178 from khrisrichardson/spelling
...
add sphinx spelling extension. enforce en_US
2014-07-14 15:43:33 -06:00
Colton Myers
08d7847e44
Add configuration file location for minion (and FreeBSD for master)
2014-07-14 12:22:27 -06:00
Khris Richardson
1acd82f3f1
add sphinx spelling extension. enforce en_us
2014-07-13 13:43:33 -05:00
Erik Johnson
2849950bce
Docs cleanup
...
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
2014-07-13 11:02:33 -05:00
vs
16269130e6
Merge remote-tracking branch 'upstream/develop' into minion_failover_master
...
Conflicts:
doc/ref/configuration/master.rst
2014-05-30 12:14:19 -07:00
Thomas S Hatch
b8897a5b0d
rename the sls renderer to the yamlex renderer
2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd
Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration
...
Conflicts:
salt/pillar/__init__.py
2014-05-30 09:16:21 -06:00
vs
f007cfecd5
add missing 's'
2014-05-30 08:04:08 -07:00
