jraby
296de21056
Document syslog facility format and default value
2015-12-15 14:56:13 -05:00
Mike Place
1c6e896edb
Merge pull request #29655 from abednarik/disable_log_doc_update
...
Added a note regarding logging configuration.
2015-12-15 11:50:05 -07:00
Colton Myers
5ac96cc8ba
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/client/ssh/ssh_py_shim.py
salt/modules/tls.py
salt/states/git.py
salt/transport/tcp.py
2015-12-14 15:56:26 -07: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
Mike Place
fe0778dad5
Merge pull request #29644 from rallytime/esxi-fixes
...
Fixed a couple more ESXi proxy minion bugs
2015-12-14 11:36:28 -07:00
abednarik
221c11f7da
Updated documentation for Salt Development.
...
In order to install pip modules for salt development we need to make sure that python devel is installed.
Otherwise pip command will fail.
2015-12-14 13:57:51 -03:00
rallytime
577d5487a3
Fixed a couple more ESXi proxy minion bugs
...
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
2015-12-11 16:16:25 -07:00
Mike Place
9f83ab9cfc
Merge pull request #29611 from cachedout/lint_29350
...
Lint 29350
2015-12-10 16:05:10 -07:00
Colton Myers
0afa5b0d5d
Add cmd_umask to roster docs
2015-12-10 14:51:43 -07: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
rallytime
5a2bb260d3
Added ESXi Proxy Minion Tutorial
...
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
2015-12-09 18:00:20 -07:00
Akhter Ali
88a55475a4
Merge branch 'develop' of github.com:saltstack/salt into Typo_correction
2015-12-09 17:03:31 -05:00
Akhter Ali
abe16e0b9f
Fixing typo
2015-12-09 16:48:14 -05:00
Joe Healy
b96d8ff1d9
Minor update to release notes for missing fix
...
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4
Fix typo specfic -> specific
2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762
Fix typo comparsion -> comparison
2015-12-09 12:17:49 +01:00
Adrian Heine né Lang
b765bd46dc
Update service manager info for Debian
...
Debian Jessie switched to `systemd` as default init system.
2015-12-09 08:49:02 +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
Mike Place
25d3a75d8c
Merge pull request #29540 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-08 14:27:01 -07:00
Mike Place
3ae096b7ac
Merge pull request #29499 from rallytime/esxi-proxy
...
Initial commit of ESXi Proxy Minion
2015-12-08 14:10:13 -07:00
Aditya Kulkarni
b3fdce7b75
Add docs
2015-12-08 15:58:38 -05:00
Colton Myers
9673fd0937
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/ec2.py
tests/unit/states/file_test.py
2015-12-08 12:23:26 -07:00
Simon A. Eugster
eb04e54b38
Compiler Ordering Docs: Use double backticks for highlighting inline code
2015-12-08 19:02:57 +01:00
Mike Place
de7f3d5a59
Merge pull request #29504 from rallytime/fix-12072
...
Document userdata_file option for EC2 driver
2015-12-08 09:54:33 -07:00
Justin Findlay
917e6f850c
2015.8.2 notes: add note about not being released
2015-12-08 09:16:26 -07:00
rallytime
90b4823bc2
Switch volumes and del_*_on_destroy example ordering
...
Refs #29101
2015-12-07 19:30:23 -07:00
rallytime
8357c95dc2
Document userdata_file option for EC2 driver
...
Fixes #12072
2015-12-07 16:52:10 -07:00
Erik Johnson
2461552a06
Hide aliased function
2015-12-07 15:20:51 -06:00
abednarik
8e5c3e366a
Added Documentation note in salt cloud.
...
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
2015-12-06 13:42:18 -03:00
Jacob Hammons
c2dc709bce
Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes
2015-12-03 20:14:16 -07:00
Jacob Hammons
4f51a737f9
Added CVE 2015-8034 to 2015.5.8 release notes
2015-12-03 20:02:16 -07:00
jacobhammons
ab890b632a
Merge pull request #29417 from jacobhammons/repo-install-updates
...
Repo install updates
2015-12-03 19:39:41 -07:00
Jacob Hammons
d58182c5fa
updated repo path for RHEL installation
2015-12-03 19:36:12 -07:00
twangboy
7bdddaca53
Fixed grammer
2015-12-03 11:18:32 -07:00
twangboy
d965d00a09
Fix #19332
...
Clarified precedence of pillar values
2015-12-03 11:15:46 -07:00
Jacob Hammons
5e54359869
Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes.
2015-12-03 10:55:32 -07:00
Mike Place
7afd522878
Merge pull request #29339 from jacksontj/develop
...
Simplify TCP/IPC wire protocol
2015-12-03 09:58:41 -07:00
Jacob Hammons
ebf72924d2
updated version numbers in documentation
2015-12-03 09:21:48 -07:00
Jacob Hammons
486935b233
updated version numbers
2015-12-03 08:21:50 -07:00
Jacob Hammons
824721ff36
updated version numbers
2015-12-03 08:20:22 -07:00
Simon A. Eugster
5d76642197
Add an example to the watch requisite.
2015-12-03 09:14:15 +01:00
Thomas Jackson
8309b69740
Simplify TCP/IPC wire protocol
...
As I was working on another project, I ran into some other project doing exactly this. Our current wire protocol is effectively "len-of-thing thing", but msgpack already includes headers in the serialization--making it an iterably consumable format. This means we don't need to use/waste bytes on the wire for the len of the string (esp. since its currently a string serialization of how many bytes).
This change simplifies the wire protocol, but still maintains flexibility for changes later-- since we are effectively just msgpacking dicts across the wire.
Note: this is a backwards incompatible wire protocol change. This is only being done as TCP is considered "experimental". This will be the last and only change to the wire protocol in a backwards incompatible fashion-- as we are working towards first-class support for the next release.
2015-12-02 09:01:58 -08:00
Colton Myers
3f09d58fff
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/rh_ip.py
salt/modules/s3.py
salt/modules/saltutil.py
salt/modules/zypper.py
salt/spm/__init__.py
salt/utils/aws.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
tests/unit/pydsl_test.py
2015-12-01 15:31:03 -07:00
Justin Findlay
08ced73b13
Merge pull request #29315 from jfindlay/docs
...
dev tutorial doc: fix markup errors
2015-12-01 14:42:17 -07:00
Colton Myers
0d90dd3a19
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/salt-master.service
salt/modules/win_pkg.py
2015-12-01 13:26:44 -07:00
Justin Findlay
e8e23dc444
dev tutorial doc: fix markup errors
2015-12-01 13:05:57 -07: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
