rallytime
6360ecd3b3
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cloud/clouds/scaleway.py
- salt/config/__init__.py
- salt/log/mixins.py
- salt/minion.py
- salt/modules/ps.py
- salt/utils/decorators/__init__.py
- salt/utils/schema.py
- tests/unit/modules/etcd_mod_test.py
- tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61
Merge branch '2016.3' into 'develop'
...
Conflicts:
- conf/master
- conf/minion
- doc/ref/proxy/all/index.rst
- salt/cli/daemons.py
- salt/modules/key.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/utils/__init__.py
- salt/utils/cloud.py
- tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
rallytime
1a1ce05186
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- .testing.pylintrc
- salt/cloud/clouds/joyent.py
2016-03-15 12:34:57 -06:00
Jacob Hammons
fd7f7bcddf
Updated release notes
...
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
2016-03-14 16:34:22 -06:00
rajvidhimar
bfb8a9212c
added junos state module and added more functionalities to junos module
2016-03-14 11:41:30 +05:30
Seth House
cb72b19240
Fix outdated Jinja 'env' variable reference
2016-03-10 19:48:42 -07:00
rallytime
fe7ff0ebfa
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cloud/__init__.py
- salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Imran Iqbal
e4df5d9a55
Fix typo in example for section winrepo_dir_ng
2016-03-08 13:21:52 -07:00
rallytime
838dc12b77
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/daemons.py
- salt/config/__init__.py
- salt/exceptions.py
- salt/pillar/foreman.py
- salt/returners/local_cache.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/cloud.py
The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
Imran Iqbal
1f0b742052
Fix typo in example for section winrepo_dir_ng
2016-03-04 22:19:25 +00:00
Erik Johnson
0f175a4edf
salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
f8664103b1
salt.returners.redis_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
0ea1b76c22
salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
d6d794b484
salt.returners.postgres: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
82750ab699
salt.returners.pgjsonb: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
d8f90f6578
salt.returners.odbc: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
a1957c3706
salt.returners.mysql: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
ef6aa5de1c
salt.returners.multi_returner: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
5b4eb58d99
salt.returners.mongo_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
da1acbb8f2
salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
c13bb6549c
salt.returners.memcache_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
4322ad9ef3
salt.returners.influxdb_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
1dd106183c
salt.returners.etcd_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
8e80535516
salt.returners.couchdb_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
44538dfced
salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
978b6cb32f
Add missing RST file for slsutil module
2016-03-03 21:40:36 -06:00
rallytime
2ee175c6d3
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/fileclient.py
- salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
rallytime
031a75ca33
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- Contributing.rst
- conf/master
- doc/index.rst
- doc/man/salt.7
- pkg/suse/README.suse
- salt/client/ssh/state.py
- salt/minion.py
- salt/modules/zypper.py
- salt/utils/schedule.py
- tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d
Remove trailing white spaces in documentation files
2016-03-01 17:36:23 +02:00
Mike Place
f2e2e6e3cf
Merge pull request #31316 from kraney/kraney_bugfix
...
Let ext_pillar_first determine the override order
2016-02-29 09:09:35 -07:00
LoveIsGrief
0eba4cdf17
Public documentation for salt-cloud virtualbox
2016-02-28 17:29:02 +01:00
Kris Raney
0aa6334442
Merge branch 'develop' into kraney_bugfix
...
Conflicts:
salt/pillar/__init__.py
2016-02-26 09:41:09 -06:00
rallytime
40cd0ac8fe
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/states/file.py
- tests/runtests.py
2016-02-25 16:21:15 -07:00
rallytime
3b74d123af
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/modules/selinux.py
- salt/modules/zypper.py
- salt/pillar/__init__.py
- salt/states/dockerng.py
- tests/runtests.py
2016-02-25 12:36:22 -07:00
Jacob Hammons
748acab8b5
Fixed zeromq casing in transport settings
2016-02-25 09:38:41 -07:00
Kris Raney
afa297e4d1
Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first
2016-02-25 10:17:39 -06:00
Jacob Hammons
765a226907
Fixed transport description in minion / master config
2016-02-25 09:08:54 -07:00
Jacob Hammons
a72dc15720
Assorted doc issues
...
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
2016-02-24 16:56:52 -07:00
Kyle Stapp
87f4843490
Clarified the form of requisite targets/requisite-references
2016-02-24 10:34:03 -05:00
Mircea Ulinic
8ad5794b60
Proxy Minion for network devices using Napalm library
2016-02-23 17:44:39 +00:00
rallytime
4baea26c58
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/topics/netapi/index.rst
- salt/modules/win_servermanager.py
- salt/modules/zypper.py
2016-02-20 12:27:41 -07:00
Erik Johnson
eebc325040
Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options
2016-02-18 16:34:14 -06:00
Justin Findlay
4953f7b0df
doc/ref/renderers/index.rst: remove env support
2016-02-16 19:26:57 -07:00
Justin Findlay
a21bad82e5
doc/ref/file_server/index.rst: remove env support
2016-02-16 19:26:57 -07:00
rallytime
8e3fd82718
Document onfail requisite bugfix behavior change
...
Refs #22370 and #31235
2016-02-16 10:44:42 -07:00
Colton Myers
076b49a4ca
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
...
Conflicts:
README.rst
doc/conf.py
doc/ref/index.rst
doc/ref/proxy/all/salt.proxy.ssh_sample.rst
doc/topics/installation/rhel.rst
doc/topics/releases/2015.8.4.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/cloud/clouds/opennebula.py
salt/config/__init__.py
salt/modules/boto_dynamodb.py
salt/modules/boto_ec2.py
salt/modules/boto_elasticache.py
salt/modules/boto_elb.py
salt/modules/boto_iam.py
salt/modules/boto_rds.py
salt/modules/boto_sns.py
salt/modules/boto_sqs.py
salt/modules/dracr.py
salt/modules/git.py
salt/modules/mine.py
salt/modules/systemd.py
salt/modules/win_pkg.py
salt/modules/yumpkg.py
salt/pillar/__init__.py
salt/states/git.py
salt/states/rabbitmq_vhost.py
salt/states/saltmod.py
salt/utils/pkg/rpm.py
setup.py
tests/unit/modules/systemd_test.py
tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
rallytime
742d0a6b04
Change all relevant Boron references to 2016.3.0
...
And more Boron deprecation warnings to Carbon
2016-02-10 15:45:28 -07:00
Mike Place
efe47eb7e1
Merge pull request #30917 from rallytime/remove-botocore-aws-driver
...
Remove deprecated botocore_aws driver in Boron release
2016-02-10 12:07:14 -07:00
rallytime
33eb6ba125
Remove overstate docs and a few references.
...
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
2016-02-08 09:28:32 -07:00
rallytime
9f55ca34a3
Remove doc references, too!
2016-02-05 11:17:22 -07:00
rallytime
8577a4f528
Remove deprecated libcloud_aws driver in Boron release
2016-02-05 11:13:10 -07:00
Denys Havrysh
936c1ff6c8
Add explanation about N@
classifier. Inspired by #25292
2016-02-04 14:06:41 +02:00
Denys Havrysh
8bc2426816
Update example in master config documentation reference
2016-02-04 13:58:41 +02:00
rallytime
ca044dd201
Add grains modules to salt modindex
...
Fixes #28790
2016-02-02 13:35:49 -07:00
rallytime
cdc7957808
Fix some autodoc import warnings from building docs
2016-02-02 12:19:38 -07:00
rallytime
6375aa2be3
Add new dimension data to doc list
2016-02-02 09:00:01 -07:00
Jacob Hammons
b192a9ba38
Doc restructuring, organization, and cleanup. Updated the doc navigation.
2016-01-31 20:10:02 -07:00
Jorge Schrauwen
d003d3c5b3
add missing docs for mdata
2016-01-29 16:25:51 +00:00
rallytime
86c3f2016e
Fix-up autodoc proxy modules for consistency
...
And to make sure everything is displayed in the module index
2016-01-28 12:33:07 -07:00
Colton Myers
0ee078eaf1
Merge pull request #30647 from terminalmage/issue11304
...
Allow custom types to sync to the master
2016-01-27 15:35:01 -07:00
Colton Myers
c15999edd9
Merge pull request #30428 from davisj/pillar_cache
...
Add pillar_cache functionality to minion.
2016-01-27 14:28:08 -07:00
rallytime
4fa80f2d5e
Merge branch '2015.8' into 'develop'
...
Conflicts:
- doc/ref/states/all/index.rst
- salt/cloud/__init__.py
- salt/minion.py
- salt/modules/file.py
- salt/modules/guestfs.py
- salt/modules/ipmi.py
- salt/modules/osquery.py
- salt/modules/parted.py
- salt/modules/seed.py
- salt/modules/virt.py
- salt/modules/yumpkg.py
- salt/modules/zypper.py
- salt/states/boto_elb.py
- salt/states/pkg.py
2016-01-26 16:19:39 -07:00
Erik Johnson
dcf5ed6369
Add information about change to extention_modules
2016-01-26 14:41:39 -06:00
Erik Johnson
c93b693f4c
Add saltutil runner to docs toctree
2016-01-26 14:41:39 -06:00
Jake Davis
1b96a3e7e4
Merge branch 'develop' of https://github.com/saltstack/salt into pillar_cache
2016-01-26 13:43:00 -05:00
Jake Davis
4cbf49d487
Rename 'pillar_cache' as 'minion_pillar_cache.'
2016-01-26 10:14:35 -05:00
rallytime
57b7e6cc93
Add glance state to list of state modules
...
Fixes #30621
2016-01-25 12:35:19 -07:00
Nicole Thomas
05349071dc
Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider
...
Adds cloud provider support for ProfitBricks
2016-01-25 11:28:41 -07:00
Ethan Devenport
de7d1666f6
Updates made after PR review:
...
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
2016-01-25 18:02:10 +00:00
Sean Jenkins
9924acdc43
Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062
2016-01-25 08:57:39 -07:00
Sean Jenkins
841192ee2d
Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062
2016-01-25 08:49:13 -07:00
Jonathan Ballet
a329adfb21
Add missing salt.queues.* documentation
2016-01-25 12:19:21 +01:00
Jonathan Ballet
2465cf4ba5
Remove non-existing documentation
...
This removes warnings during the documentation compilation
2016-01-25 12:19:21 +01:00
Colton Myers
9885976ac3
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.yumpkg.rst
salt/modules/yumpkg.py
2016-01-22 12:59:54 -07:00
Mike Place
05d05263ab
Merge pull request #30532 from whiteinge/slsutil-mod
...
Add execution module for working in sls files
2016-01-22 10:25:16 -07:00
Seth House
a57d9984e4
Add slsutil to doc index
2016-01-22 09:45:45 -07:00
Andrew Colin Kissa
806823315e
Add postgres_initdb state module documentation
2016-01-22 12:21:03 +02:00
Erik Johnson
a118eb5d2e
Merge branch '2015.5' into 2015.5-2015.8
2016-01-22 01:20:27 -06:00
Colton Myers
cb8bf91944
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/ref/configuration/master.rst
doc/topics/cloud/linode.rst
salt/cloud/clouds/linode.py
salt/modules/rh_ip.py
salt/renderers/pyobjects.py
salt/states/file.py
2016-01-21 17:42:50 -07:00
Ethan Devenport
44491f69cf
Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services.
2016-01-21 22:52:25 +00:00
Jorge Schrauwen
2ad5fc1a75
enable doc generation for solaris_system
2016-01-21 19:40:44 +00:00
Erik Johnson
330e26d1da
Hide get_locked_packages
2016-01-21 09:56:13 -06:00
Jake Davis
60f7e3ea01
Fixed chmod lint issue. Added notices about security implications.
2016-01-21 10:39:31 -05:00
Jake Davis
616e9c3f2b
Add pillar_cache functionality to minion.
...
Allows minon to save rendered pillar data to cachedir for later use
when file_client is set to local.
2016-01-21 10:39:31 -05:00
Mike Place
2b7d20cee7
Merge pull request #30457 from rallytime/fix-22820
...
Remove fsutils references from modules list
2016-01-20 09:43:50 -07:00
Jacob Hammons
2b7f96bf0e
Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron
2016-01-19 21:57:45 -07:00
Sean Jenkins
9665d9655f
Set (pillar_)merge_lists to default for PR#30062
2016-01-19 15:06:50 -07:00
Sean Jenkins
e44a30620b
Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead
2016-01-19 15:06:30 -07:00
rallytime
3288ff104d
Remove fsutils references from modules list
...
Fixes #22820
2016-01-19 14:41:02 -07:00
rallytime
39b49621ad
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/beacons/service.py
- salt/cloud/clouds/vmware.py
- salt/modules/file.py
- salt/modules/ipset.py
- salt/modules/npm.py
- salt/modules/rpm.py
- salt/states/file.py
- salt/utils/event.py
- salt/utils/schedule.py
- tests/unit/modules/state_test.py
2016-01-14 13:33:53 -07:00
Mike Place
1f5c1093fc
Merge pull request #30235 from sjorge/state-zfs
...
salt.states.zfs
2016-01-12 12:39:13 -07:00
Jacob Hammons
e5079ab4c9
Changed notes to indicate that functions are matched using regular expressions instead of minions
2016-01-12 11:55:36 -07:00
Jorge Schrauwen
087e8f8475
Generate docs for salt.states.zfs
2016-01-08 17:24:44 +00:00
Colton Myers
17b919e9ec
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/eauth/access_control.rst
salt/modules/state.py
salt/state.py
salt/states/boto_secgroup.py
tests/unit/modules/state_test.py
2016-01-07 16:36:40 -07:00
Jacob Hammons
44ce704206
Updated zmq_monitor
docs
2016-01-07 14:26:33 -07:00
Jacob Hammons
0d2111d397
Assorted doc bug fixes
...
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
2016-01-07 14:08:30 -07:00
Colton Myers
f476c75fad
Merge pull request #30062 from seanjnkns/develop
...
Remove recurse_list from pillar_source_merging_strategy and add pilla…
2016-01-06 10:27:35 -07:00
Sean Jenkins
8fc656b6f2
Set (pillar_)merge_lists to default for PR#30062
2016-01-06 09:55:20 -07:00
Colton Myers
7f8e666b8c
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/states/user.py
2016-01-06 09:30:28 -07:00
Colton Myers
d73a7d6c4d
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/ssh/index.rst
2016-01-05 16:11:20 -07:00
Jered Sutton
01dbf385ef
Adding random_master to reference and updating master_shuffle.
...
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
2016-01-02 23:49:08 -06:00
Sean Jenkins
fb6e895bf0
Merge remote-tracking branch 'upstream/develop' into develop
2015-12-30 09:43:05 -07:00
Sean Jenkins
1d7ee7bed2
Merge remote-tracking branch 'origin/develop' into sean
2015-12-30 08:44:30 -07:00
Andrew Colin Kissa
61ca281519
fix inline documentation examples not rendering
...
add missing modules to indexes
2015-12-30 07:35:57 +02:00
rallytime
c386d70742
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/modules/alternatives.py
- salt/modules/boto_rds.py
- salt/modules/mount.py
- salt/states/boto_iam.py
2015-12-29 15:51:12 -07:00
Sean Jenkins
41353b7ab3
Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead
2015-12-29 10:22:54 -07:00
Mike Place
e915f4b591
Merge pull request #30053 from akissa/add-postgres-privileges-support
...
Add postgres privileges support
2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
8066a06191
add postgres_language state module documentation
2015-12-29 13:13:37 +02:00
Andrew Colin Kissa
d27f0cc88a
add postgres_privileges ref docs
2015-12-29 13:02:56 +02:00
Jacob Hammons
a04cebd48c
Remove internal APIs from rest_cherrypy docs.
...
Refs #28540
2015-12-28 15:26:16 -07:00
Andreas Lutro
03ceaf103b
add documentation about omitting state modules in requisites
2015-12-24 13:07:44 +01:00
Jonathan Ballet
e6e36372a4
doc: fix documentation link for salt.serializers
2015-12-23 10:13:16 +01:00
Jorge Schrauwen
1294a1fa5c
probably a good idea to actually add salt.states.zpool
2015-12-22 19:16:18 +00:00
Jorge Schrauwen
da80dea902
try to get state.states.smartos docs go be generated
2015-12-22 19:11:46 +00:00
Jorge Schrauwen
f5333ee2f8
salt.modules.fmadm still does not have docs generated, trying again
2015-12-22 19:08:22 +00:00
Mike Place
c19782a184
Merge pull request #29853 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-12-22 08:05:49 -07:00
B M Corser
b89e9c6476
Presumably what was meant
...
Otherwise it's invalid syntax
2015-12-21 21:17:23 +00:00
Jonathan Ballet
6922da46dc
doc: fix warnings + some rendering issues
2015-12-21 13:26:02 +01:00
Colton Myers
95fe811724
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/minion.py
salt/modules/network.py
salt/scripts.py
salt/states/file.py
salt/states/git.py
salt/utils/event.py
2015-12-18 15:00:24 -07:00
Mike Place
fb4eb28645
Merge pull request #29819 from rallytime/esxi-docs
...
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
Eric Mosher
0a765de370
Add infoblox documentation
...
Closes #29780
2015-12-17 23:01:55 -05:00
Thibault Cohen
d37064951d
Add k8s modules and states documentation
2015-12-17 21:44:49 -05:00
rallytime
e7c5863468
Add esxi module and state to docs build
...
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
rallytime
3b7f5540ec
Add vSphere module to doc ref module tree
2015-12-17 10:54:28 -07:00
Andrew Colin Kissa
b749b9faba
Add Pillar SQLCipher module
...
Fixes #29781
2015-12-17 09:48:27 +02:00
rallytime
45b77fb288
Add note about shell truthiness vs python truthiness
2015-12-15 16:14:31 -07:00
rallytime
3bfb87c031
Spelling fixes
2015-12-15 15:45:19 -07:00
rallytime
15c466cc12
Further clarifications on "unless" and "onlyif" requisites.
...
Fixes #14634
- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
2015-12-15 15:42:56 -07:00
jraby
296de21056
Document syslog facility format and default value
2015-12-15 14:56:13 -05:00
abednarik
bdf1824bd8
Added a note regarding logging configuration.
...
Simple example on how to turn off logging.
2015-12-14 17:26:40 -03:00
Colton Myers
48311d42f7
Merge pull request #29384 from Granjow/watchRequisites
...
Add an example to the watch requisite.
2015-12-10 12:12:50 -07:00
Simon A. Eugster
d32bcc7d97
Documentation: Prefer cmd.run + onchanges over cmd.wait.
...
* Add information on how the watch requisite targetse other states
* Update examples in salt.states.cmd about cmd.run and cmd.wait
2015-12-10 08:12:09 +01:00
Simon A. Eugster
39e6bd7cc5
Requisite Documentation: Explain how to target other states
2015-12-10 08:05:42 +01:00
Colton Myers
7918736656
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/client/ssh/ssh_py_shim.py
salt/modules/dracr.py
salt/states/boto_vpc.py
tests/unit/states/file_test.py
2015-12-08 14:46:23 -07:00
Mike Place
9bc9ca78de
Merge pull request #29496 from terminalmage/remove-repoquery
...
Remove dependency on repoquery from yumpkg.py
2015-12-08 14:28:08 -07:00
Simon A. Eugster
eb04e54b38
Compiler Ordering Docs: Use double backticks for highlighting inline code
2015-12-08 19:02:57 +01:00
Erik Johnson
2461552a06
Hide aliased function
2015-12-07 15:20:51 -06:00
Simon A. Eugster
5d76642197
Add an example to the watch requisite.
2015-12-03 09:14:15 +01:00
Mike Place
7e424e10f2
Merge pull request #28054 from dr4Ke/custom_grains_deep_merge
...
loader uses a deep dictionary merge for the grains (core and customs)
2015-12-01 10:33:52 -07:00
rallytime
9ba9019419
Initial commit of ESXi proxy work.
...
Update grains information to work properly
Added NTP functionality to vsphere module
Add ssh enable/disable capabilities
Allow list of host_names in ntp functions
Password update, ssh_restart, datetime management functionality added
Added enable/disable vsan and disk listing capabilities
Don't stack trace is VSAN System or VSAN Config are unset
Be able to provide a list of passwords via pillar to auth against a host
Fix bug with test.ping returning False, even though other functions work
Add ability to add blank host disks to host's vsan system
Minor bug fix for vsan_add_disks function
2015-11-30 12:42:36 -07:00
Jimmy Tang
bdda03c456
Add logentries engine
...
This engine is first attempt at a simple engine to send event information
to the Logentries logging service.
2015-11-30 13:58:10 +00:00
Jorge Schrauwen
ed95e84b2b
generate docs for fmadm module
2015-11-25 14:43:38 +00:00
Jacob Hammons
b344ebfe4a
doc for salt.states.smartos
2015-11-18 17:21:57 -07:00
Christophe Drevet-Droguet
03fe8c7885
grains_deep_merge config option documentation
2015-11-18 20:48:11 +01:00
Colton Myers
8a23181dd7
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/rabbitmq.py
salt/modules/win_system.py
salt/modules/yumpkg.py
salt/states/mount.py
2015-11-09 17:05:43 -07:00
Colton Myers
aeeaa7c90d
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/config.py
salt/minion.py
salt/pillar/s3.py
2015-11-09 12:12:24 -07:00
Thomas Jackson
f63c2d70a7
Rework minion return_retry_timer
...
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.
Cleanup of #27286
Fixes #28577
2015-11-06 18:05:45 -08:00
rallytime
cded9ac01d
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
2015-11-06 09:34:31 -07:00
rallytime
eec9d69387
Merge branch '2015.5' into '2015.8'
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/file.py
tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
rallytime
d31b0d1573
Merge branch '2015.8' into develop
2015-11-04 15:40:03 -07:00
Benjamin Drung
89dcb66310
Fix the wrong "allow to do" phrase
...
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
2015-11-04 12:15:41 +01:00
Benjamin Drung
8edd2c1add
Fix typos of dependency
2015-11-04 10:58:40 +01:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
Colton Myers
32969b2408
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
salt/cloud/clouds/digital_ocean.py
salt/cloud/clouds/linode.py
salt/loader.py
salt/modules/blockdev.py
salt/modules/boto_route53.py
salt/modules/boto_vpc.py
salt/modules/bsd_shadow.py
salt/modules/file.py
salt/modules/rabbitmq.py
salt/modules/schedule.py
salt/modules/win_network.py
salt/runners/state.py
salt/spm/__init__.py
tests/unit/modules/blockdev_test.py
2015-11-02 18:19:01 -07:00
Mike Place
abe3003aed
Merge pull request #28204 from DSRCompany/issues/23157_rename_client_acl
...
Deprecate client_acl with publisher_acl (rename)
2015-10-26 08:04:56 -06:00
Mike Place
00c4c64c60
Merge pull request #28208 from jacksontj/develop
...
Clearer documentation of the multiprocessing option
2015-10-23 07:42:40 -06:00
Dmitry Kuzmenko
7a5204ef02
Deprecate client_acl with publisher_acl (rename)
...
Keeping client_acl support
2015-10-23 11:59:40 +03:00
Thomas Jackson
cfb768ac30
Clearer documentation of the multiprocessing option
2015-10-22 08:45:54 -07:00
Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Colton Myers
b3f3275e0a
Merge pull request #28163 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-10-21 16:46:40 -06:00
Colton Myers
a471832fa7
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/ec2.py
salt/config/__init__.py
salt/modules/git.py
salt/modules/hosts.py
salt/modules/htpasswd.py
salt/states/boto_secgroup.py
salt/states/htpasswd.py
tests/unit/modules/schedule_test.py
2015-10-20 18:13:11 -06:00
Thayne Harbaugh
7f8d5a56d1
Improve documentation of check_cmd
.
...
* Make the distinction between requisite `check_cmd` and `file.managed`
`check_cmd`.
* Be more clear about `file.managed` `check_cmd`, the temporary file,
and when the new contents are written or discarded.
* In requisite `check_cmd` use a concise `!` rather than the awkward
`&& exit 1 || exit 0`.
* A few minor, stylistic changes.
2015-10-20 13:44:06 -06:00
C. R. Oldham
1085eeab2b
Merge pull request #27922 from cro/fx2
...
WIP States/Modules for managing Dell FX2 chassis via salt-proxy
2015-10-19 17:29:21 -06:00
C. R. Oldham
3712066fc9
More docs.
2015-10-19 13:19:20 -06:00
C. R. Oldham
4ce2f8bb11
Documentation.
2015-10-16 16:52:14 -06:00
Domingo Kiser
4af5b5c33f
introduce recurse_list pillar_source_merging_strategy
2015-10-16 05:24:40 -06:00
Domingo Kiser
a8adaa8f9e
introduce recurse_list pillar_source_merging_strategy
2015-10-12 21:59:39 -07:00
Richard Hansen
9aa19575fa
new ldap state module
2015-10-09 17:47:56 -04:00
Richard Hansen
39abc94739
new ldap3 execution module
...
This is an alternative to the existing ldapmod module.
2015-10-09 17:47:56 -04:00
Colton Myers
9128e8e7ae
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
2015-10-07 13:14:28 -06:00
Colton Myers
69d960f8e6
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
2015-10-07 13:11:48 -06:00
Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
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/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
Justin Findlay
03400ef45b
fix virtual fcn return doc indentation
...
Fixes #27724 .
2015-10-07 11:49:16 -06:00
Jacob Hammons
75cc07cf10
noted that __virtual__ can return False and an error string
2015-10-07 09:48:46 -06:00
Jacob Hammons
b928e1afa8
update docs for __virtual__ and __virtualname__
...
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546
update __virtual__ return documentation
...
Related to #26755 ; fixes #27116 ; implements part of #27643 .
2015-10-06 13:47:31 -06:00
Jacob Hammons
76dc8de71b
Assorted doc bugs
...
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Jacob Hammons
5a9867aad1
initial engines topic, updates to windows repo docs
...
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Daniel Hahler
98a8c0f055
doc: minor fixes to doc and comments
2015-10-02 01:18:32 +02:00
Colton Myers
73b90f155e
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
rallytime
105528720b
Outputters should sync to output, not outputters, on the minion.
...
Otherwise, the loader won't pick them up.
Fixes #17103
2015-09-28 16:53:53 -06:00
Jonathan Ballet
97e69ebb97
doc: fix state's top documentation typo
2015-09-25 12:16:48 -06:00
Jacob Hammons
a9fdecada1
Fix css layout Refs #27389
...
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
jacobhammons
24e665335d
Merge pull request #27399 from multani/fix/docs
...
Various documentation fixes
2015-09-25 09:42:52 -06:00
Jonathan Ballet
c4e7392a2b
doc: fix state's top documentation typo
2015-09-25 10:36:27 +02:00
Colton Myers
c4965e14ea
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/modules/yumpkg.py
2015-09-23 14:36:09 -06:00
Colton Myers
ec6cd80496
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/ref/auth/all/index.rst
doc/ref/auth/all/salt.auth.rest.rst
doc/ref/beacons/all/index.rst
doc/ref/beacons/all/salt.beacons.ps.rst
doc/ref/pillar/all/index.rst
doc/ref/pillar/all/salt.pillar.consul_pillar.rst
doc/ref/pillar/all/salt.pillar.neutron.rst
doc/ref/pillar/all/salt.pillar.sql_base.rst
doc/ref/pillar/all/salt.pillar.sqlite3.rst
doc/ref/sdb/all/salt.sdb.rest.rst
salt/modules/rh_ip.py
salt/utils/http.py
2015-09-22 15:31:46 -06:00
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
Aaron S.
13f5f7bb3e
default log_level is info, not warning
...
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
2015-09-18 13:59:45 -07:00
Aaron S.
3d866f773d
log_level default is info
...
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
2015-09-18 13:59:01 -07:00
Colton Myers
9864d9e0fa
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/index.rst
doc/topics/releases/boron.rst
salt/cli/daemons.py
salt/cli/salt.py
salt/modules/jboss7.py
salt/states/file.py
2015-09-18 11:03:37 -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
26b6c92975
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
salt/config/__init__.py
salt/modules/rh_ip.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/user.py
salt/templates/rh_ip/rh7_eth.jinja
2015-09-17 11:10:37 -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
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -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
Colton Myers
278e8dda5b
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
2015-09-01 15:15:13 -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
Colton Myers
76c70162db
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
doc/topics/spm/index.rst
salt/cloud/clouds/gce.py
salt/cloud/clouds/opennebula.py
salt/cloud/clouds/openstack.py
tests/unit/states/file_test.py
2015-08-26 14:47:33 -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
Colton Myers
9159800ce8
Merge pull request #26583 from jodv/zip_modules
...
Using .zip archives as self-contained Salt modules
2015-08-25 15:33:10 -06:00
Jacob Hammons
fefd7aa7e8
2015.8.0 release notes and doc/conf.py updates
2015-08-25 15:12:20 -06:00
Colton Myers
3d6f7b0e6a
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/utils/aws.py
2015-08-25 13:57:49 -06:00
Justin Findlay
859801f2b6
Merge pull request #26564 from lyft/add-netaddress-module
...
Add netaddress module for getting info about IP networks
2015-08-25 10:38:27 -06:00
Jeremy Rosenbaum
b122adcf45
documentation for zip archive modules
2015-08-24 10:51:17 -07: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
Colton Myers
75f48b4a96
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/targeting/grains.rst
2015-08-21 16:48:48 -06:00
Ryan Lane
241c76d60a
Add netaddress module for getting info about IP networks
2015-08-21 12:15:11 -07: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
Colton Myers
73282d51cc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cli/daemons.py
salt/master.py
salt/minion.py
salt/modules/gpg.py
salt/modules/pw_group.py
salt/utils/http.py
setup.py
tests/unit/modules/schedule_test.py
2015-08-19 11:29:45 -06:00
Erik Johnson
56fc78de80
Hide aliased funcs from docs
2015-08-17 17:29:13 -05:00
C. R. Oldham
7fc3232633
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 11:37:04 -06:00
Colton Myers
110cae3cdc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-11 18:14:31 -06: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
Mike Place
889b4d2795
Merge pull request #24878 from cachedout/issue_12483
...
Top file enhancements
2015-08-11 11:24:46 -06:00
Justin Findlay
fd70187176
Merge pull request #26189 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-10 22:18:57 -06:00
Colton Myers
1b0b21394e
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
Nitin Madhok
cc73fe619f
Merge branch develop
2015-08-10 13:43:13 -04: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
Thomas S Hatch
0e705d2185
add pchanges docs
2015-08-08 09:32:29 -06:00
Seth House
b0d4defa36
Add note about top-file only env assignment and the show_top() function
2015-08-07 16:33:55 -06:00
Seth House
163f377d13
Minor spelling, style fixes
2015-08-07 15:32:19 -06:00