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
76,149 Commits 24 Branches 182 Tags 341 MiB
2723188c6f
Commit Graph

3997 Commits

Author SHA1 Message Date
Michael Lustfield
ef3a0f95ed Update index.rst 2016-09-27 00:57:54 -05:00
Michael Lustfield
5ee003d3c7 Adding orchestrate/reactor notes 2016-09-27 00:56:00 -05:00
Michael Lustfield
1c26723f3e Adding note about reactor SLS file locations 2016-09-27 00:39:19 -05:00
Michael Lustfield
845e5bb342 Cleaning up a bit more for consistency 2016-09-26 17:00:38 -07:00
Michael Lustfield
edb43183ec Updating from deprecated syntax 2016-09-26 16:50:00 -07:00
Michael Lustfield
88fc5d4a38 Adding information to avoid blocking master processes 2016-09-26 16:48:43 -07:00
Michael Lustfield
bdecd2c140 Updated example 
While technically correct, I felt the example caused assumptions that generated confusion later in the text.
 2016-09-26 16:38:56 -07:00
Mike Place
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop 2016-09-26 21:47:32 +09:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Erik Johnson
2df51ce3e9 Rewrite minionfs walkthrough 
This walkthrough did not reflect the blacklist/whitelist or mountpoint
features, this commit rewrites it.
 2016-09-22 18:23:32 -05:00
rallytime
7fdc73136c Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-22 17:03:24 -06:00
C. R. Oldham
edb47231b2 Add support for specifying a datastore for new disks. (#36457) 
* Add support for specifying a datastore for new disks.

* Document validity of a datastore key inside a disk definition.

* Add docs for "datastore" param for disks

* Lint

* Align tests for new calls
 2016-09-22 17:02:30 -06:00
rallytime
8e0b1a3718 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-22 10:09:06 -06:00
rallytime
1755f22de1 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-22 10:01:17 -06:00
Mike Place
32e1988b1f Update index.rst 2016-09-22 13:30:21 +09:00
Mike Place
ec4f4f49ca Merge pull request #36478 from rallytime/fix-36475 
Add the "bash" option to the "code-block"directive.
 2016-09-22 13:15:14 +09:00
Erik Johnson
4839c325ae Improve the rebase docs in contributing guidelines 
These docs do not tell people how to deal with branch diversions which
happen as a result of a rebase, and could lead (let's be real, probably
_has led_) to users pulling/merging, which will add a buttload of
unrelated commits to their pull request.

This update shows how to force-push when necessary.
 2016-09-21 13:53:27 -05:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
 2016-09-21 10:43:38 -06:00
rallytime
7be7d5832f Add the "bash" option to the "code-block"directive. 
Fixes #36475

By adding the "bash" argument, we avoid the following error and the docs
will display appropriately:
```
/root/SaltStack/salt/doc/topics/tutorials/gitfs.rst:918: ERROR: Error in "code-block" directive:
1 argument(s) required, 0 supplied.

.. code-block::

    Cmnd_Alias SALT_GIT_HOOK = /bin/salt-call event.fire_master update salt/fileserver/gitfs/update
    Defaults!SALT_GIT_HOOK !requiretty
    ALL ALL=(root) NOPASSWD: SALT_GIT_HOOK
```
 2016-09-21 10:17:10 -06:00
Mike Place
c54ad1c555
Document salttesting helpers 2016-09-21 23:26:59 +09:00
twangboy
ec67a9bb2f Add cachedout's recommendations 2016-09-21 07:39:20 -06:00
Archie
8f514f2841 Fix typo 2016-09-20 21:07:33 -07:00
twangboy
26a40dadbe Update docs for Windows 2016-09-20 17:19:40 -06:00
rallytime
514d6012f3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-20 10:49:36 -06:00
rallytime
7bcbf8dc36 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
 2016-09-20 10:43:55 -06:00
Rajvi Dhimar
bb439eacde Update carbon.rst 2016-09-19 14:33:12 -06:00
Oz N Tiram
ffdebf7a25 Fix a minor typo in docs 2016-09-19 14:30:34 -06:00
rallytime
2f9c4268f7 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-19 11:21:55 -06:00
Nicole Thomas
acfce59666 Removes extra empty lines in the disk specificity example (#36410) 2016-09-19 11:13:08 -06:00
Aditya Kulkarni
892df0c089 Add ability to specify disk backing mode for VMware cloud profile (#36334) 
* Add ability to specify disk backing mode for VMware cloud profile

* Update release notes and version added
 2016-09-19 11:05:49 -06:00
Rajvi Dhimar
4ba4d2afbe Update carbon.rst (#36395) 2016-09-19 09:43:56 -06:00
rallytime
93d34af667 Merge branch 'carbon' into 'develop' 
Conflicts:
  - tests/unit/utils/schema_test.py
 2016-09-16 14:38:10 -06:00
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
 2016-09-16 10:35:49 -06:00
Joseph Hall
2a77316123 Update usage docs for Thorium (#36368) 2016-09-16 09:52:47 -06:00
Erik Johnson
b815c98577 Add note about yumpkg.check_db removal in Boron 
Resolves #36292.
 2016-09-15 15:30:07 -05:00
Oz N Tiram
04753bf67c Fix a minor typo in docs (#36329) 2016-09-15 10:16:54 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
Aditya Kulkarni
d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver 2016-09-12 14:49:20 -04:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
Erik Johnson
a3442a88ed Update docs on run_run_plus 2016-09-03 14:59:04 -05:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06: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
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
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
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
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
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
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
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
rallytime
caa113d390 Remove outputter kwarg from jobs runner. It has been deprecated. 2016-08-23 13:32:59 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
Mike Place
b3f2410fe9 Docs 2016-08-23 18:12:09 +09:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Nicole Thomas
92ecbc3b26 Remove deprecated version of status.uptime module function (#35535) 
* Remove the deprecated version of the status.uptime function.

The deprecated version of the function was set to be removed in
Carbon. The Carbon release notes were also updated with this change.

* Remove test_deprecated_uptime unit test

The deprecated version of uptime no longer exists.

* Remove unused import and deprecated uptime reference
 2016-08-22 09:25:21 -06:00
Mike Place
45a12ccaf0 Add Nitrogen release notes and remove deprecation warning for core grains 
We can't have a deprecation warning thrown for grains on every single salt-call.
That's just too much. Documenting in the release notes will be fine.
 2016-08-22 11:52:01 +09:00
Mike Place
2876e67ac4 Merge pull request #35530 from rallytime/remove_add_proxymodule_to_opts 
Remove add_proxymodule_to_opts from minion.py in Carbon
 2016-08-20 11:33:40 +09:00
Mike Place
05ea6b7083 Merge pull request #35532 from rallytime/remove_parse_args_and_kwargs 
Remove the parse_args_and_kwargs function from minion.py
 2016-08-20 11:32:31 +09:00
Nicole Thomas
399e9f57cc Update release notes for 2015.8.12 (#35614) 2016-08-19 16:13:08 -06:00
rallytime
f2eb625778 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-19 11:13:15 -06:00
Nicole Thomas
21c9c2d025 Make sure version label is correct in header (#35603) 2016-08-19 10:29:58 -06:00
Nicole Thomas
83425274f5 Update release notes for 2016.3.3 (#35602) 2016-08-19 10:27:34 -06:00
Nicole Thomas
0c7aa802f5 Update release notes for 2015.8.12 (#35600) 2016-08-19 10:13:41 -06:00
Nicole Thomas
dd12b48239 Update release notes for 2015.8.12 (#35599) 2016-08-19 09:59:31 -06:00
Erik Johnson
fd08d33597 Add warning about AWS flagging of nmap usage (#35575) 
* Add warning about AWS flagging of nmap usage

Also improve the verification examples overall, and add a note about the
fingerprint display difference beginning in OpenSSH 6.8.

* Remove "as root"

For some reason, when I was running the test in the example, I wasn't
getting the script output for the host key, unless I ran as root. Don't
know why this was the case but I can't reproduce it now. Removing this
as it is not accurate.

Also added a port number to the example as well since it speeds up the
nmap command.
 2016-08-18 17:00:02 -06:00
Mike Place
9279d6b6eb Merge pull request #35496 from StackPointCloud/profitbricks-cloud-improvements 
ProfitBricks cloud provider features and improvements
 2016-08-18 09:39:02 +09:00
rallytime
c2cc4f13a3 Remove the parse_args_and_kwargs function from minion.py 
It is deprecated and marked for removal in Carbon.
 2016-08-17 12:41:23 -06:00
rallytime
376976a19b Remove add_proxymodule_to_opts from minion.py in Carbon 
Also remove relevant documentation references - these config settings
are no longer needed.
 2016-08-17 12:22:25 -06:00
Ethan Devenport
de42b0135c Added new features and improvements to the ProfitBricks provider including: 
* Refactored LAN and NIC provisioning to use a more efficient composite server request.
* Added support for new INTEL_XEON and AMD_OPTERON CPU family types.
* Allow additional data volumes can be created and attached to servers.
* Added public and private network firewall rules.
* Added preliminary support for loadbalancers CLI functions.
* Corrected ProfitBricks name topic index.
* Updated ProfitBricks provider documentation.
* Updated provider integration test configs.
* PEP8 clean up.
 2016-08-16 20:07:42 +00:00
rallytime
45e1424ba3 Remove the env and activate kwargs from pip install/ed functions 
These options have been marked for deprecation in Carbon. The bin_env
option replaces both of these keyword agrs in the pip execution module
as well as the pip state.
 2016-08-16 11:06:20 -06:00
Mike Place
e3858d8f80 Merge pull request #35400 from thatch45/snapper_states 
Introduce rollback to Salt States
 2016-08-16 12:04:39 +09:00
rallytime
d17fbe96de LXC execution module Carbon deprecations 2016-08-15 16:28:23 -06:00
Thomas S Hatch
89a0f0ddc4 Add to release notes, snapper! 2016-08-11 16:00:25 -06:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Nicole Thomas
d9c20c0456 Update freebsd.rst (#35394) 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-08-11 11:00:36 -06:00
Mike Place
dfac0dec9f Merge pull request #35368 from rallytime/file-module-deprecations 
Remove contains_regex_multiline function from file module
 2016-08-11 09:36:02 +09:00
Mike Place
354da71209 Merge pull request #35361 from rallytime/blockdev-deprecations 
Blockdev deprecations
 2016-08-11 09:35:04 +09:00
rallytime
102fcbe916 Remove contains_regex_multiline function from file module 2016-08-10 16:43:49 -06:00
rallytime
8083c97786 Remove the vsphere.rst docs for Carbon 
Forgot to remove this file when removing the vsphere cloud driver
in #35248.
 2016-08-10 16:16:29 -06:00
rallytime
96bc36ca2e Remove deprecated functions from blockdev module 2016-08-10 10:37:14 -06:00
Mike Place
2c6f785bfa Merge pull request #35283 from twangboy/windows_build_scripts 
Add Salt-Master to Installer for Windows
 2016-08-10 20:46:42 +09:00
Mike Place
0167db1448 Merge pull request #35317 from rallytime/fileserver-runner-deprecations 
Remove deprecated outputter kwarg from fileserver runner
 2016-08-10 20:36:11 +09:00
rallytime
3d5c160b5d Use Carbon instead of Boron for new develop functions/args/kwargs 2016-08-09 16:07:39 -06:00
rallytime
6dcea4f705 Remove deprecated outputter kwarg from fileserver runner 2016-08-09 15:16:20 -06:00
Nicole Thomas
904324d7b3 Reorganize deprecation docs into sections in Carbon release notes (#35307) 
This makes all of the deprecations more readable and easier to find
things that have been deprecated in the Carbon release.
 2016-08-09 13:20:12 -06:00
twangboy
098a6bc538 Fix typos in documentation 2016-08-09 17:27:45 +00:00
twangboy
0a5d804a40 Update documentation for new installer 2016-08-09 17:23:48 +00:00
rallytime
14454eab72 Add cloud deprecations to release notes 
And give cloud deprecations their own section to make things
easy to spot.
 2016-08-08 19:47:56 -06:00
rallytime
8f2058219e Remove private_ip option in linode driver 
This option has been deprecated - use assign_private_ip instead.
 2016-08-08 19:25:18 -06:00
Mike Place
715dc14b9b Merge pull request #35247 from rallytime/carbon-deprecations 
Remove some of the things that are deprecated in Carbon
 2016-08-09 09:00:27 +09:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Thomas S Hatch
f8158124d5 Merge pull request #35211 from cachedout/issue_31074 
Alternative sudo users for salt-ssh
 2016-08-08 09:40:55 -06:00
Mike Place
104116f464 Add release notes and include entry about disk.wipe fix 2016-08-07 06:58:55 +09:00
rallytime
9216e8ad93 Remove deprecated vsphere cloud driver in Carbon release 
This driver has been marked for deprecation and removal in Carbon.
Release notes were updated accordingly.

Users will need to use the vmware cloud driver instead.
 2016-08-05 16:16:12 -06:00
rallytime
51d22112d7 Docs cleanup 2016-08-05 16:02:37 -06:00
rallytime
4d6b214380 Remove deprecated zpool_list function in zpool module 2016-08-05 15:47:52 -06:00
rallytime
a0dd435304 Remove carbon deprecations from the virt runner 
Several functions were removed as well as any references to the "hyper"
kwarg. "host" should be used instead.

Release notes were also updated with this information.
 2016-08-05 15:08:43 -06:00
rallytime
8f76d92b72 Remove use of always kwarg in pgkbuild.built state: deprecated 
This has been deprecated and marked for removal in Carbon. Also added
a note to the release notes about this change. Use 'force' instead.
 2016-08-05 14:48:54 -06:00
rallytime
c99c7969c3 Remove deprecated created, started, and cloned functions from lxc state 
Also updates the Carbon release notes to include these removals and
includes which functions replace the deprecated functions
 2016-08-05 14:26:46 -06:00
rallytime
5dad736f3c Add hash_hostname, iam utils funcs, and ip_in_subnet deprecations to Carbon release notes 2016-08-05 13:07:18 -06:00
Mike Place
6f53232e6d Better error handling and a workaround for group mismatch. 2016-08-05 03:41:36 +09:00
Mike Place
5b56a4acf7 Docs 2016-08-05 03:24:18 +09:00
Jonathan Ballet
1642dba5d1 doc: fix broken links in the test documentation page 2016-08-04 16:56:42 +02:00
Thomas S Hatch
da6107647d Add some release notes on features for carbon (#35188) 
* Add initial relnotes for ceph, docker and thorium stuff

* more
 2016-08-03 17:01:41 -06:00
rallytime
df5f3d45a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-08-03 15:06:17 -06:00
rallytime
a64026fc99 Start release notes for 2016.3.3 2016-08-02 15:47:17 -06:00
Jacob Hammons
f4d869fb0f doc version updated to 2016.3.2 (#35147) 
updated the navigation headings
 2016-08-02 14:21:52 -06:00
Jacob Hammons
4967ed275f doc version update to 2015.8.11, updates to release notes (#35145) 2016-08-02 13:55:32 -06:00
rallytime
72a116b731 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-08-02 13:05:36 -06:00
Mike Place
222449cd0e Merge pull request #34920 from cachedout/key_cache 
Key cache
 2016-08-02 12:11:18 -06:00
rallytime
0d5f0b6016 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-02 10:40:26 -06:00
Mike Place
b91bccaae5 Merge pull request #35086 from ankitforcode/Adding_digital_ocean_ssh_interface_feature 
Adding Digital Ocean ssh_interface feature
 2016-08-02 01:54:01 -06:00
Thomas S Hatch
307d5a17b2 Branding, it matters 2016-08-01 16:01:14 -06:00
Thomas S Hatch
9c1bb5c3ff Merge pull request #35062 from thatch45/develop 
Initial Docker sls tutorial
 2016-08-01 15:57:39 -06:00
Thomas S Hatch
d3a5e13ef3 like this you think? 2016-08-01 15:55:46 -06:00
Thomas S Hatch
c7ea94ea01 it is no secret, I don't spell too well :) 2016-08-01 15:06:40 -06:00
Thomas S Hatch
64d6282135 SUSE, not Suse, not SuSE 2016-08-01 15:00:37 -06:00
Thomas S Hatch
b37e81a6cf clarify on image used 2016-08-01 14:44:32 -06:00
Thomas S Hatch
823dc8d586 fix typo 2016-08-01 14:23:07 -06:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
 2016-08-01 13:42:36 -06:00
rallytime
fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability 
Refs #33870
 2016-08-01 11:14:53 -06:00
Mike Place
9bf9edb0e0 Merge pull request #35071 from terminalmage/issue35065 
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
 2016-08-01 06:52:40 -06:00
Ankit Agarwal
3b668158c6 Adding feature ssh_interface for Digital Ocean Cloud Config 2016-07-31 23:32:04 +05:30
Duncan Mac-Vicar P
9bfb3d85f1 add links to (open)SUSE family of images and build generation tools 2016-07-31 10:37:18 +02:00
Erik Johnson
723b536eae Add documentation, release notes mention for new feature 2016-07-29 19:28:52 -05:00
Thomas S Hatch
82228b47d9 Initial Docker sls tutorial 2016-07-29 10:32:10 -06:00
Mike Place
bd5e2a3ed3 Merge pull request #35033 from UtahDave/fix_win_cpu_model 
Fix cpu_model grain on Windows to actual CPU model
 2016-07-29 10:06:25 -06:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart 
Introduce a template system for extending SaltStack open
 2016-07-28 22:38:10 -06:00
rallytime
bdcc81a384 Start release notes file for 2015.8.12 2016-07-28 17:16:49 -06:00
David Boucha
2fe747c05c add release note about the cpu_model grain change 2016-07-28 15:35:55 -06:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/schedule.py
 2016-07-28 11:08:14 -06:00
Anthony Shaw
5b2a97e22b
added docs 2016-07-28 11:33:42 +10:00
Anthony Shaw
1280940079
linting fixes 2016-07-28 09:13:22 +10:00
Erik Johnson
82ebfc6b31 Improve Carbon release docs 2016-07-27 12:15:28 -05:00
Erik Johnson
6ae5667c23 Clarify usage of module.run state in states documentation 2016-07-27 11:57:55 -05:00
Erik Johnson
4e804217e3 Add documentation on utility modules 2016-07-27 11:56:41 -05:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Anthony Shaw
dac5cec503
start doc layout 2016-07-27 19:56:35 +10:00
Mike Place
9cd052f07f Merge pull request #34959 from terminalmage/utils-in-runners 
Make __utils__ dunder available in runner funcs
 2016-07-26 16:13:35 -06:00
Erik Johnson
7b22b6b0e6 Add new runner feature to Carbon release notes 2016-07-26 12:29:59 -05:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Denys Havrysh
0faa490991 Fix job scheduling using `when parameter (by python-dateutil`) 2016-07-26 17:37:28 +03:00
Mike Place
1ca13c006a Add note in scaling doc 2016-07-24 11:54:21 -06:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707 
Feature addition: preserve mode in file states
 2016-07-22 16:43:31 -06:00
rallytime
9227c3dd26 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - conf/master
 2016-07-21 13:39:21 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Thomas S Hatch
94df6f8dc6 Add a clarifying note on Saltfile 2016-07-21 11:09:28 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
Erik Johnson
087500bde7 Add new file mode preservation feature to carbon release notes 2016-07-20 15:33:11 -05:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
C. R. Oldham
bf4dc079df Document fqdn_base. 2016-07-18 15:49:59 -06:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756) 
adds link to all tutorials to using salt section
Refs #33923
 2016-07-18 15:36:50 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure 
Refs #27980
 2016-07-18 11:26:36 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
Mike Place
c6700a219a Document how to test for the existence of a log message (#34738) 2016-07-18 09:12:13 -06:00
Mike Place
abf5b976ed Merge pull request #34722 from rallytime/fix-34630 
Various spelling fixes
 2016-07-16 13:49:54 -06:00
rallytime
b9e0bd1918 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-16 13:24:10 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-16 12:29:54 -06:00
rallytime
f20e78b534 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 15:35:21 -06:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
Mike Place
07840714c5 Merge pull request #34608 from pass-by-value/cassandra_cql_returner_opts 
Add support for more options to Cassandra CQL returner
 2016-07-14 09:06:43 -06:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Aditya Kulkarni
857208394f Add support for more options to Cassandra CQL returner 2016-07-12 11:50:01 -04:00
Loren Gordon
bfe0dd0b8a Clarifies the proper way to reference states 
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
 2016-07-12 07:58:27 -04:00
Christer Edwards
220a3ae53f Update freebsd.rst 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-07-10 10:22:30 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix 
Use -O in the wget example in the bootstrap tutorial for the develop branch
 2016-07-07 10:30:46 -06:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-07-05 13:11:32 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
Mike Place
d4c04e07f0 Merge pull request #34358 from thatch45/thor_more 
Add Thorium states to auto clean out old keys
 2016-06-30 11:37:32 -07:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Thomas S Hatch
c6882ca974 suggest a sane default interval 2016-06-30 09:45:17 -06:00
Joseph Hall
fb3f05dfd7 Update dependency docs for SPM (#34385) 
* Update dependency docs for SPM

* Typo
 2016-06-30 11:12:26 -04:00
Thomas S Hatch
29b6253b3e Add all the things I always forget :) 2016-06-29 09:47:34 -06:00