Thomas S Hatch
b3d2edc9a5
Merge branch '2014.7' into develop
2014-11-04 15:11:23 -07:00
Colton Myers
df0547969f
We evaluate a prereq, we don't call it. Fixes #17086
2014-11-04 11:36:30 -07:00
Henrik Holmboe
1f3ba9ced5
Add possible values to arguments in Salt man-page
2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2
Typo jod -> job
2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837
Choose vs chose typo
2014-11-03 20:54:39 +01:00
Seth House
aff7ab3f43
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-29 16:47:23 -05:00
Seth House
9da07584e4
Added missing docs for the /key rest_cherrypy entry point
...
Should have been part of #16706 .
2014-10-29 16:35:04 -05:00
vs
7d84f116e3
fix formatting
2014-10-29 14:37:18 +01:00
vs
4beb56bdbb
add wheel.minions to wheel-index
2014-10-29 14:35:13 +01:00
vs
9e63712488
add documentation for wheel.minions
2014-10-29 14:18:23 +01:00
Colton Myers
945e6506b6
Merge branch '2014.7' into develop
2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805
Fix pre-required vs pre-requiring mixups in prereq doc
2014-10-27 10:59:07 -06:00
rallytime
933be7c476
Merge branch '2014.7' into develop
...
Conflicts:
salt/master.py
salt/returners/mysql.py
salt/utils/cloud.py
salt/utils/minions.py
2014-10-25 08:54:42 -06:00
vs
692252f41b
Merge branch 'sreq_cache_option' into optional_sreq_caching
2014-10-23 15:55:26 +02:00
Thomas S Hatch
cb14a8660e
fix docs for mod_aggregate per #16575
2014-10-21 16:37:34 -06: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
Joseph Hall
130e0842c8
Merge pull request #16566 from terminalmage/docs
...
Minor wording fix in highstate docs
2014-10-11 06:34:39 -06:00
Erik Johnson
af64f17fe4
Minor wording fix in highstate docs
...
This fixes some grammar weirdness.
2014-10-10 22:25:55 -05:00
rallytime
54b7abdb17
Fix conf_minion references
2014-10-10 09:19:27 -06:00
Nicole Thomas
2901e9439b
Merge pull request #16514 from cachedout/master_doc_fix
...
Small doc fixes
2014-10-09 15:07:17 -06:00
Mike Place
11ef20fdf5
Small doc fixes
2014-10-09 10:14:37 -06:00
Seth House
b0615f9bbf
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-08 14:40:32 -06:00
rallytime
6d1c14b1be
Add recon_* config options to minion docs
...
Fixes #16471
2014-10-08 14:11:34 -06:00
Colton Myers
000b391f2f
State Module, not State Declaration
2014-10-07 19:25:44 -06:00
Thomas S Hatch
d4eaf2323e
Merge pull request #16339 from cachedout/module_fail_reasons
...
Module failure reporting
2014-10-07 10:21:37 -06:00
Jens Rantil
53153277ce
Fix incorrect client ACL documentation
...
Tested this by setting up a local Vagrant instance using the following
procedure:
1. Made a fresh minion/master install (using salt-bootstrap) of version
2014.1.10.
2. Adding a `test.ping` ACL rule for the `vagrant` user.
3. Asserting that I couldn't execute `salt '*' test.ping'` as `vagrant`
user.
4. Applying `chmod 755 /var/cache/salt /var/cache/salt/master/jobs
/var/run/salt /var/run/salt/master`.
5. Verifying that `salt '*' test.ping'` now works.
Fixes #16318 .
2014-10-05 10:40:37 +02:00
Mike Place
2abc93afe6
Merge branch 'develop' into module_fail_reasons
2014-10-03 13:08:39 -06:00
Mike Place
a5e1540f22
Provide a facility for modules to report the reasons they cannot be
...
loaded.
2014-10-02 15:43:10 -06:00
Jeremy Rosenbaum
4668480dff
fixes inconsistent bar/baz variable name in state module example
2014-10-01 21:53:45 -07: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
KennethWilke
0a4f3ad098
corrected master jobs path in clientacl doc
2014-09-25 16:07:28 -05:00
Thomas S Hatch
bc2a897c3e
Merge pull request #16063 from jacksontj/2014.7
...
2014.7 RC fixes/backports
2014-09-25 09:03:06 -06:00
Thomas S Hatch
3ce955c774
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/deploy/bootstrap-salt.sh
2014-09-24 12:46:37 -06:00
Erik Johnson
a4413bb27a
Improve formatting
...
Bullet points look better here than an indented section with an enormous
font.
2014-09-23 20:58:26 -05: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
Thomas S Hatch
3f82e3664a
Merge branch '2014.7' into develop
2014-09-23 14:41:58 -06:00
rallytime
872b312770
Clarify unless and onlyif docs
2014-09-22 16:03:04 -06: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
