Justin Findlay
|
294dfe2d94
|
clarify and expand console log colors help
|
2015-03-26 23:21:30 -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 |
|
rallytime
|
c65d9673a7
|
Merge branch '2014.7' into merge_forward_fifteen_second_try
Conflicts:
salt/states/file.py
|
2015-01-29 13:42:49 -07:00 |
|
Seth House
|
e3d29bf8ff
|
Fixed syntax error in log_granular_levels example
|
2015-01-27 20:14:53 -07: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 |
|
Nitin Madhok
|
5d8ae4e32f
|
Fixing sphinx violations and errors
|
2014-11-18 02:53:40 -05:00 |
|
vs
|
692252f41b
|
Merge branch 'sreq_cache_option' into optional_sreq_caching
|
2014-10-23 15:55:26 +02: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 |
|
vs
|
2e1d3b07b8
|
add cache_sreqs option to minion documentation
|
2014-10-16 07:33:37 +02:00 |
|
Erik Johnson
|
49c7e6ac1a
|
Fix misspelled code-block type
|
2014-10-15 22:44:27 -05: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 |
|
Thomas S Hatch
|
1468c26ec1
|
Merge branch '2014.7' into develop
Conflicts:
doc/faq.rst
doc/ref/configuration/minion.rst
salt/minion.py
salt/states/pkg.py
salt/transport/__init__.py
|
2014-10-13 15:03:33 -06:00 |
|
rallytime
|
54b7abdb17
|
Fix conf_minion references
|
2014-10-10 09:19:27 -06:00 |
|
Mike Place
|
11ef20fdf5
|
Small doc fixes
|
2014-10-09 10:14:37 -06:00 |
|
rallytime
|
6d1c14b1be
|
Add recon_* config options to minion docs
Fixes #16471
|
2014-10-08 14:11:34 -06:00 |
|
Chris Rebert
|
5ec98a7c4f
|
fix typos in doc/ref/configuration/master.rst
|
2014-10-01 14:06:11 -07:00 |
|
Ryan Lane
|
9eacaf1832
|
Add a use_master_when_local option to allow remote execution while using a local file_client
|
2014-09-28 18:53:43 -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 |
|
Colton Myers
|
99e97320e1
|
Merge branch '2014.7' into develop
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
|
2014-09-22 14:22:54 -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
|
70f10cb13e
|
Fix sphinx build error
|
2014-09-17 18:00:18 -05: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 |
|
Thomas S Hatch
|
2f6ae96f37
|
Merge branch '2014.7' into develop
Conflicts:
salt/client/ssh/__init__.py
|
2014-09-03 14:43:07 -06:00 |
|
Nitin Madhok
|
0e61c4125d
|
Fixing sphinx violation and warning
|
2014-09-03 15:22:26 -04:00 |
|
Erik Johnson
|
510942d3ec
|
Remove references to masterless salt from gitfs docs
Alternate backends do not yet work with the local fileclient.
|
2014-09-02 15:59:05 -05:00 |
|
Mike Place
|
be60e25574
|
Merge branch '2014.7' into develop
|
2014-09-02 13:56:54 -06:00 |
|
Erik Johnson
|
ed631d69b5
|
Add fileserver_backend param to minion config documentation
Also correct an incorrect rst link target for hash_type
|
2014-09-02 14:36:35 -05:00 |
|