Nitin Madhok
71d964bccf
Removing non existing document
2014-11-18 03:10:59 -05:00
Colton Myers
f625c21d77
Merge branch '2014.7' into mergeforward
...
Conflicts:
salt/cloud/clouds/ec2.py
salt/daemons/flo/worker.flo
salt/master.py
salt/minion.py
salt/modules/lxc.py
salt/states/win_update.py
salt/states/zk_concurrency.py
2014-10-30 17:42:36 -06:00
Thomas Jackson
9f7dac0674
Spelling fixes for docs
2014-10-28 08:12:27 -07:00
Chris Rebert
d37690e156
fix typos: retreived [sic]
2014-10-27 16:13:46 -07:00
Mike Place
3767666ccb
Note the presence of master_alive_interval in MM docs.
...
Refs #14906
2014-10-23 11:47:00 -06:00
Martyn Smith
a899af7418
Fix example command to one that exists
...
Fix walkthrough to use disk.usage instead of disk.percent (which doesn't appear to exist any more).
2014-10-21 09:51:54 +13: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
90ba9b8a43
Add notice that per-remote auth params are not supported in GitPython
2014-10-18 17:36:51 -05:00
Erik Johnson
00bd8477dd
Fix sphinx build error
...
There is no 'math' lexer in sphinx.
2014-10-15 22:43:37 -05:00
Tim O'Guin
156768408a
updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master
2014-10-04 14:57:06 -05:00
Tim O'Guin
41978cc449
updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master
2014-10-03 01:35:28 -04:00
Thomas S Hatch
3e204c16f3
Merge branch '2014.7' into develop
2014-09-29 20:07:01 -06:00
Thomas S Hatch
ea5c8518db
Merge pull request #16246 from rallytime/pillar_docs
...
Add note on how to set pillar data on the command line to pillar tutorial
2014-09-29 20:03:47 -06:00
Ed Kern
3933cdb72a
pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst
2014-09-29 16:21:08 -06:00
rallytime
38db7b7d5e
Add note on how to set pillar data on the command line to pillar tutorial
...
Closes #14217
2014-09-29 16:04:30 -06:00
Ed Kern
93b0c1f80e
pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst
2014-09-29 12:27:08 -07:00
Nitin Madhok
b7f43d34f8
Update instances of install_salt.sh.sh
2014-09-24 12:16:48 -04: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
Erik Johnson
36d59944d1
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
c094f8bd68
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
604a131f6f
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Hung Nguyen Viet
d47b8be40f
remove duplicate entry, it was in advanced topics
2014-09-16 14:16:17 +07:00
Nitin Madhok
b7d5b2cde2
Fixing sphinx violations and errors
2014-09-12 13:28:01 -04:00
Thomas S Hatch
d6e3e01c6d
Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules
...
F/add syslog ng modules
2014-09-12 10:37:02 -06:00
Thomas S Hatch
e34e81f41b
Merge branch '2014.7' into develop
...
Conflicts:
salt/minion.py
2014-09-05 11:03:12 -06:00
rallytime
e5a1876462
Update multimaster tutorial
2014-09-04 12:58:19 -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
Erik Johnson
3c800cdd5f
Add pygit2 install link to gitfs walkthrough
2014-09-02 23:33:11 -05:00
Colton Myers
4214f8dc2b
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/network.py
2014-09-02 16:35:03 -06: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
Erik Johnson
9b2fc52e93
Fix duplicate word
2014-09-02 15:31:13 -05:00
Erik Johnson
ac944272e0
Fix spelling error
2014-09-02 15:27:44 -05:00
Mike Place
8c737afa1e
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/cloud.py
2014-09-02 14:20:04 -06:00
Erik Johnson
ba3e0367c6
Remove extraneous word
2014-09-02 15:16:32 -05:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
0a5bc21b58
More gitfs documentation clarifications/corrections
2014-09-02 14:37:52 -05:00
Erik Johnson
0ae4a108b7
Clarify outdated information in gitfs walkthrough
...
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
2014-09-02 13:22:56 -05:00
Jille Timmermans
4064a8cf4c
Fix some documentation inconsistencies
2014-09-02 11:38:23 +02:00
Simon Schmidt
f4c9ec24de
Fix saltutil.refresh_pillar reference in Pillar tutorial
...
It used to reference `saltutil.pillar_refresh` which gives the error:
'saltutil.pillar_refresh' is not available.
2014-09-01 20:38:50 +02:00
Joseph Hall
4e29954710
Update Esky docs for clarity, and remove 2nd person
2014-08-30 19:50:32 -06:00
btibi
69b0deacf6
syslog_ng: add syslog-ng state and execution modules
2014-08-29 23:20:25 +02:00
Colton Myers
ad89a752f8
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/utils/cloud.py
2014-08-25 13:29:29 -06:00
Joseph Hall
0b546aeadd
Merge pull request #15234 from cachedout/pillar_refresh_doc
...
Add info about pillar refresh.
2014-08-25 11:12:54 -06:00
Erik Johnson
41a0753518
Add ssh_config example for GitPython
2014-08-25 12:06:29 -05:00
Mike Place
0d03e31fb7
Add info about pillar refresh.
2014-08-25 10:56:55 -06: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
Erik Johnson
5444c68437
Update docs to reflect pygit2 auth support in 0.20.3
2014-08-20 23:54:48 -05:00
