Colton Myers
ece63c36a3
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/ssh/roster.rst
salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Colton Myers
1fb84450f4
Merge pull request #23396 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-05-06 15:42:35 -06:00
Erik Johnson
d395565bf7
Update Lithium docstrings in 2015.2 branch
2015-05-06 09:27:40 -05:00
Colton Myers
2981aed48e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/ssh/roster.rst
salt/client/ssh/__init__.py
salt/client/ssh/wrapper/__init__.py
salt/config.py
salt/modules/file.py
salt/runners/lxc.py
2015-05-05 16:26:39 -06:00
Colton Myers
cb69cd07de
Match the master config template in the master config reference
2015-05-04 15:05:21 -06:00
Colton Myers
91dd9dcbdc
Add ssh_minion_opts to master config ref
2015-05-04 15:00:28 -06:00
Steve Weber
97513b060a
include module_dirs
...
include module_dirs
2015-05-04 13:00:31 -04:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
Corin Kochenower
911345dd1a
Add versionadded label for event_return
2015-04-07 14:15:03 -06:00
Mike Place
3bc74501e4
Document many core opts
...
Although these are documented in other places, we need somewhere that we
can store more in-depth, interface-specific information about various options.
This way, we can make implementation-specific comments which would not be approrpiate
for user configuration files.
2015-04-03 17:17:06 -06:00
Colton Myers
0b7ac988cc
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
salt/beacons/service.py
salt/beacons/sh.py
salt/modules/cassandra_cql.py
salt/returners/cassandra_cql_return.py
2015-04-01 14:22:33 -06:00
Thomas S Hatch
d2e4ac840d
Merge pull request #22212 from ckochenower/2015.2
...
Add detail for writing a returner
2015-03-31 15:15:52 -06:00
Corin Kochenower
f44e25715a
Add detail for writing a returner
2015-03-31 13:59:11 -06:00
Nicole Thomas
44c7eb4d4b
Merge pull request #22169 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/index.rst
doc/topics/eauth/index.rst
salt/beacons/__init__.py
salt/beacons/service.py
salt/loader.py
salt/minion.py
salt/output/nested.py
2015-03-30 15:10:17 -06:00
Elias Probst
c00c14f2be
Initial documentation improvements for pillar.pillar_ldap
2015-03-30 01:58:54 +02:00
Colton Myers
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/master
conf/minion
doc/ref/configuration/master.rst
salt/loader.py
salt/minion.py
salt/modules/ssh.py
salt/output/nested.py
salt/utils/network.py
2015-03-25 09:28:04 -06:00
rallytime
73a0df18a8
There are 4 values, not 3.
2015-03-24 14:57:29 -06:00
rallytime
c98118eb55
Update pillar_source_merging_strategy config doc spacing
...
to match accross all config values
2015-03-24 14:56:09 -06:00
Godefroid Chapelle
ffe267a741
Specify valid values for gitfs_provider option
2015-03-23 15:33:10 +01:00
Colton Myers
fd93491a5f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/linodepy.py
salt/master.py
salt/modules/boto_route53.py
salt/modules/virt.py
salt/renderers/gpg.py
salt/runners/doc.py
salt/runners/jobs.py
salt/runners/manage.py
salt/runners/virt.py
salt/utils/event.py
salt/utils/http.py
2015-03-16 15:12:02 -06:00
Thomas S Hatch
cc9d294fcd
Merge pull request #21569 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-03-12 13:36:39 -06:00
rallytime
0171f68600
Use the full version for a versionadded tag
2015-03-11 16:29:08 -06:00
Colton Myers
fec632ae18
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/utils/cloud.py
2015-03-11 15:18:00 -06:00
Colton Myers
ebe7eeafd9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/cloud/clouds/linode.py
salt/states/composer.py
salt/states/win_update.py
2015-03-11 15:14:56 -06:00
Elias Probst
bc9a30b7e9
Typo (rendered → renderer)
2015-03-11 21:15:32 +01:00
Seth House
049975a1ca
Added versionadded for ext_pillar_first
2015-03-11 11:53:59 -04:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
Seth House
4d974d9676
Improved presence docs; added cross-references and localhost caveat
...
Closes #18436 .
2015-02-28 19:22:38 -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
