valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,806 Commits 24 Branches 182 Tags 341 MiB
3a297d8036
Commit Graph

1458 Commits

Author SHA1 Message Date
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
 2015-09-22 15:20:17 -06:00
Colton Myers
7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-22 15:07:45 -06:00
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00
Justin Findlay
3d28307a00 2014.7 -> 2014.7.0 2015-09-18 16:08:47 -06:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-17 13:53:22 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00
Justin Findlay
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-15 01:29:30 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous 
Assorted style and minor updates
 2015-09-14 16:32:22 -06:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
rallytime
00fe6a225c Fix minor doc typo in client api 2015-09-07 12:55:39 -06:00
Jacob Hammons
ac3bd47440 states/pkgrepo examples, suse installation updates 
Refs #26644
Refs #26638
 2015-09-02 11:37:40 -06:00
Jacob Hammons
701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py 
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
 2015-09-01 17:09:35 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
 2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key 
#24510
 2015-08-31 20:00:30 -06:00
Jacob Hammons
06ac3bed42 Fixed typo 2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates. 
Refs #21214
 2015-08-31 13:51:31 -06:00
Jeremy Rosenbaum
763ee20713 documentation for zip archive modules 2015-08-26 12:18:57 -06:00
Mike Place
d129bf4961 Merge pull request #26657 from jfindlay/top_lint 
top file compilation fixes
 2015-08-26 10:00:34 -06:00
Justin Findlay
1d404bd561 remove trailing whitespace in state top docs 2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2 change md code quoting to rst in state top docs 2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6 add default_top description to docs 2015-08-26 01:44:33 -06:00
Jacob Hammons
fefd7aa7e8 2015.8.0 release notes and doc/conf.py updates 2015-08-25 15:12:20 -06:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Erik Johnson
b04bc228d0 Correct some inaccurate documentation, fix formatting 2015-08-21 02:38:12 -05:00
Erik Johnson
fb46a6cbda Rename ref anchor 2015-08-21 02:38:12 -05:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
Erik Johnson
56fc78de80 Hide aliased funcs from docs 2015-08-17 17:29:13 -05:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
Erik Johnson
9c155e0c1a Add warning about file.recurse unicode errors with vim swap files. 
Fixes #4699.
 2015-08-11 15:16:44 -05:00
Seth House
4471c3f237 Add note about top-file only env assignment and the show_top() function 2015-08-11 11:29:33 -06:00
Seth House
5864111429 Minor spelling, style fixes 2015-08-11 11:29:25 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -06:00
Colton Myers
32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    conf/minion
    doc/conf.py
    salt/modules/file.py
 2015-08-10 10:56:40 -06:00
Erik Johnson
157b1c8b11 Add masterless winrepo config params to minion config docs 2015-08-09 17:42:13 -05:00
Erik Johnson
7ed679ad60 Add new winrepo config params to master config docs 
Also fixed documentation for some of the gitfs and git_pillar config
params.
 2015-08-09 17:42:13 -05:00
Jacob Hammons
d220c83f77 master_finger configuration docs 
switch a script to use https:// instead of http://
Refs #25751
 2015-08-06 20:23:22 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
Justin Findlay
a83059ca01 fix test mode logic in state docs 2015-08-05 11:29:56 -06:00
Justin Findlay
0fd180e106 add test logic to state reult doc 2015-08-05 09:36:08 -06:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
 2015-08-03 14:50:50 -06:00
Justin Findlay
7e121de907 Update minion.rst 2015-07-31 17:34:07 -06:00
Jacob Hammons
ac0a8ff711 Doc on using syndic with multimaster 2015-07-31 15:25:15 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00