valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,471 Commits 24 Branches 182 Tags 341 MiB
09de18a48b
Commit Graph

6328 Commits

Author SHA1 Message Date
Erik Johnson
a3442a88ed Update docs on run_run_plus 2016-09-03 14:59:04 -05:00
Nicole Thomas
86e5edfd0a Add persist deprecation from win_useradd to Carbon release notes (#36001) 2016-09-01 11:53:25 -06:00
Mike Place
2e76f73ea1 Merge pull request #35918 from rallytime/fix-18614 
Remove the compact outputter
 2016-09-02 00:49:43 +09:00
C. R. Oldham
908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 2016-09-01 09:40:36 -06:00
Mike Place
f115e6fc8f Merge pull request #35919 from rallytime/fix-35618 
Add documentation about salt_interface to EC2 docs
 2016-09-02 00:20:27 +09:00
rallytime
ae595537ff Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/pkgng.py
 2016-08-31 16:39:54 -06:00
Thomas S Hatch
5aaad9e42e Merge pull request #35714 from rallytime/file_module_deprecations 
Remove the file.grep Carbon warning for multiple command line args
 2016-08-31 14:53:13 -06:00
Jacob Hammons
ac8fe6ff9e Version docs to 2016.3.3 2016-08-31 14:34:55 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865) 
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
 2016-08-31 09:51:36 -06:00
rallytime
ef2871c357 Add documentation about salt_interface to EC2 docs 
Fixes #35618
 2016-08-30 15:23:50 -06:00
rallytime
eed0a9d23d Remove the compact outputter 
This outputter was originally introduced in the 2014.7 branch, but
quickly regressed and never worked in a released version of Salt. Since
then, its existence has caused much confusion. In addition, this
outputter actually was supposed to accomplish the same thing as setting
"state_verbose" to False. Therefore, it doesn't make sense to maintain
two outputters (this one and the highstate outputter).

Fixes #18614
 2016-08-30 14:16:59 -06:00
rallytime
bd157b8dbe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-30 12:03:06 -06:00
Mike Place
f7d8f408c2 Merge pull request #35822 from terminalmage/issue35045 
Fixes for top file merging
 2016-08-31 01:40:41 +09:00
rallytime
9e55bee5d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-30 10:17:53 -06:00
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
Erik Johnson
f2f4482fa0 Update top file merging docs to reflect new strategy 2016-08-30 08:58:18 -05:00
Mike Place
7f067bc4f8 Merge pull request #35879 from rallytime/doc-build-cleanup 
Clean up some of the warnings during a doc build
 2016-08-30 15:44:06 +09:00
Erik Johnson
a72fcf6aad Add versionadded for args event docs 2016-08-30 00:48:06 -05:00
Erik Johnson
c6cdb049fc Add documentation for runner events 2016-08-30 00:46:29 -05:00
rallytime
3d49f6a58d Add yaml.parser to doc build mocks 2016-08-29 16:41:15 -06:00
rallytime
4ebfde9337 Remove node refernce in execution module docs: doesn't exist. 2016-08-29 15:33:26 -06:00
rallytime
2320865e5c Remove references to logstash_http engine: should be http_logstash. 2016-08-29 14:59:06 -06:00
rallytime
82e9cb748f Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/engines/sqs_events.py
  - salt/minion.py
 2016-08-29 12:48:43 -06:00
Nicole Thomas
96792663da Add engines to list of extension module options in master config docs (#35864) 
Fixes #35837
 2016-08-29 12:22:30 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
 2016-08-29 10:56:11 -06:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485 One more tweak to top file merging docs 
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
 2016-08-27 14:30:14 -05:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Todd Wells
e212c55b7a Schedule documentation update (#35745) 
* Scheduling jobs add state and module options

* Scheduling jobs doc formatting
 2016-08-26 10:47:04 -06:00
Jacob Hammons
0247867898 Adds mock for tornado.locks (#35807) 2016-08-26 10:43:34 -06:00
Nicole Thomas
0ee237a9cb Remove extra "to" in top.rst docs (#35808) 
Refs #35774
 2016-08-26 10:38:57 -06:00
Alexander Bauer
e4dfc21581 Trivial documentation spelling fix (#35800) 
Change `statnds` to `stands` in State Writing documentation.
 2016-08-26 10:30:08 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774) 
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
 2016-08-26 10:25:56 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
6784cb036d Implement suggestions of bytes vs str type for #35593 (#35783) 
* Implement suggestions of bytes vs str type for #35593

Refs #35593

* Str, not bytes
 2016-08-25 15:45:51 -06:00
Mike Place
89bf5cf250 Developer documentation for Unicode handling (#35593) 
* Developer documentation for Unicode handling

* Clarifications
 2016-08-25 15:30:31 -06:00
Nicole Thomas
9b5ee2155e Merge pull request #35763 from isbm/isbm-doc-conf-sphinx-crashfix 
Sphinx crash: documentation config fix
 2016-08-25 15:12:38 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
Nicole Thomas
0546b76d63 Revert "Template context must be populated with key:value pairs" (#35770) 2016-08-25 11:31:04 -06:00
Bo Maryniuk
a56ae4e8f5 Configure importing Mock to handle 'total' method from psutils properly 2016-08-25 16:48:34 +02:00
Bo Maryniuk
9c057d0266 Return psutil back to the list of mocked imports 2016-08-25 16:47:59 +02:00
Bo Maryniuk
3d7758461e Improve Mock to be flexible and able to mock methods from the mocked modules 2016-08-25 16:47:08 +02:00
Jacob Hammons
2a12795bac Fixes Windows download paths (#35742) 2016-08-24 13:38:17 -06:00
rallytime
748b5956b4 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/engines/sqs_events.py
  - salt/utils/gitfs.py
 2016-08-24 09:50:40 -06:00
Mike Place
fdbf01d5ad Remove docs mocks for msgpack and psutils 
Also make docs build py3 compat
 2016-08-24 22:55:11 +09:00
Mike Place
bd0790f5f7 Merge pull request #35374 from cachedout/issue_34434 
Allow for additional module validation functions.
 2016-08-24 17:32:54 +09:00
Mike Place
a6eaa277c3 Merge pull request #35707 from rallytime/jobs_runner_deprecations 
Remove outputter kwarg from jobs runner. It has been deprecated.
 2016-08-24 16:41:10 +09:00
rallytime
6bd0f98062 Remove the file.grep Carbon warning for multiple command line args 2016-08-23 14:28:21 -06:00
rallytime
adc4e0fdfe Template context must be populated with key:value pairs 
This situation has been on deprecation warning for a while to allow
people time to update their state files. For the Carbon release, we
are switching the warnings over to raise SaltInvocationErrors.
 2016-08-23 14:07:39 -06:00