Nicole Thomas
3b9c3c5671
Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs
...
Adding missing output flags to salt cli docs
2017-08-11 14:35:18 -04:00
Nicole Thomas
e5b98c8a88
Merge pull request #42882 from gtmanfred/2016.11
...
make sure cmd is not run when npm isn't installed
2017-08-11 13:53:14 -04:00
Daniel Wallace
da3402a53d
make sure cmd is not run when npm isn't installed
...
apparently the skipIf on the functions still get run, even if the function is
going to be skipped based on a skipIf on the class.
2017-08-11 10:58:00 -06:00
Nicole Thomas
5962c9588b
Merge pull request #42788 from amendlik/saltify-timeout
...
Remove waits and retries from Saltify deployment
2017-08-11 11:38:05 -04:00
Nicole Thomas
227ecddd13
Merge pull request #42877 from terminalmage/add-cron-state-virtual
...
Add virtual func for cron state module
2017-08-11 11:33:09 -04:00
Nicole Thomas
ab9f6cef33
Merge pull request #42859 from terminalmage/gitpython-git-cli-note
...
Add note about git CLI requirement for GitPython to GitFS tutorial
2017-08-11 10:53:02 -04:00
Nicole Thomas
682b4a8d14
Merge pull request #42856 from gtmanfred/2016.11
...
skip cache_clean test if npm version is >= 5.0.0
2017-08-11 09:39:19 -04:00
Erik Johnson
f1de196740
Add virtual func for cron state module
...
This prevents a traceback when you attempt to use a cron state without
cron being installed.
2017-08-11 08:32:19 -05:00
Nicole Thomas
01ea854029
Merge pull request #42864 from whiteinge/syndic-log-root_dir
...
Make syndic_log_file respect root_dir setting
2017-08-11 09:28:21 -04:00
Seth House
4b1f55da9c
Make syndic_log_file respect root_dir setting
2017-08-10 17:06:49 -06:00
Erik Johnson
35e05c9515
Add note about git CLI requirement for GitPython to GitFS tutorial
2017-08-10 16:47:47 -05:00
Robert James Hernandez
744bf954ff
Adding missing output flags to salt cli
2017-08-10 13:19:08 -07:00
Daniel Wallace
b458b89fb8
skip cache_clean test if npm version is >= 5.0.0
2017-08-10 14:17:47 -06:00
Nicole Thomas
2dde1f77e9
Merge pull request #42851 from terminalmage/bp-42651
...
Backport #42651 to 2016.11
2017-08-10 14:02:38 -04:00
Daniel Wallace
a3da86eea8
fix syntax
2017-08-10 11:08:27 -05:00
Daniel Wallace
6ecdbcec1d
make sure names are correct
2017-08-10 11:08:26 -05:00
Daniel Wallace
f83b553d6e
add py3 for versionlock
2017-08-10 11:08:26 -05:00
Daniel Wallace
21934f61bb
python2- prefix for fedora 26 packages
2017-08-10 11:08:25 -05:00
Nicole Thomas
c746f79a3a
Merge pull request #42806 from rallytime/fix-42683
...
Update doc references in glusterfs.volume_present
2017-08-10 10:10:16 -04:00
Nicole Thomas
27a8a2695a
Merge pull request #42829 from twangboy/win_pkg_fix_install
...
Fix passing version in pkgs as shown in docs
2017-08-10 10:07:24 -04:00
Nicole Thomas
3c3ac6aeb2
Merge pull request #42838 from twangboy/win_doc_pki
...
Document requirements for win_pki
2017-08-10 09:59:45 -04:00
twangboy
f0a1d06b46
Standardize PKI Client
2017-08-09 17:53:22 -06:00
twangboy
7de687aa57
Document requirements for win_pki
2017-08-09 17:49:20 -06:00
garethgreenaway
b3e2ae3c58
Merge pull request #42805 from rallytime/bp-42552
...
Back-port #42552 to 2016.11
2017-08-09 15:37:55 -07:00
garethgreenaway
d2ee7934ed
Merge pull request #42804 from rallytime/bp-42784
...
Back-port #42784 to 2016.11
2017-08-09 15:37:40 -07:00
Nicole Thomas
4cbf8057b3
Merge pull request #42826 from terminalmage/fix-spelling
...
Fix misspelling of "versions"
2017-08-09 15:39:42 -04:00
twangboy
83b9b230cd
Add winrepo to docs about supporting versions in pkgs
2017-08-09 12:05:42 -06:00
twangboy
81fefa6e67
Add ability to pass version in pkgs list
2017-08-09 11:59:32 -06:00
Erik Johnson
00f93142e4
Fix misspelling of "versions"
2017-08-09 12:24:06 -05:00
rallytime
8c8640d6b8
Update doc references in glusterfs.volume_present
...
The "created" option has been deprecated in favor of volume_present
and the docs need to match.
Fixes #42683
2017-08-08 14:35:53 -04:00
remijouannet
5a91c1f2d1
update consul module following this documentation https://www.consul.io/api/acl.html
2017-08-08 14:21:49 -04:00
Daniel Wallace
dbd29e4aaa
only read file if it is not a string
2017-08-08 14:19:00 -04:00
Nicole Thomas
de997edd90
Merge pull request #42786 from Ch3LL/fix_typo
...
Fix typo for template_dict in http docs
2017-08-08 14:14:50 -04:00
Nicole Thomas
bf6153ebe5
Merge pull request #42795 from lomeroe/bp-42744_201611
...
backport #42744 to 2016.11
2017-08-08 13:17:14 -04:00
lomeroe
695f8c1ae4
fix #42600 in develop
...
attempt to write data to regpol file even if data_to_write is empty
(i.e. no policies configured)
2017-08-08 09:24:51 -05:00
Adam Mendlik
928b523797
Remove waits and retries from Saltify deployment
...
The waits and retries are there to give a new VM a chance
to be created and booted. Saltify works against existing
VMs, so there is no need to wait for services to become
available.
2017-08-07 16:26:42 -06:00
Mike Place
61fad97286
Merge pull request #42748 from whiteinge/save-before-output
...
Workaround Orchestrate problem that highstate outputter mutates data
2017-08-07 16:11:32 -05:00
Mike Place
a4e3e7e786
Merge pull request #42764 from amendlik/cloud-win-loop
...
Fix infinite loop with salt-cloud and Windows nodes
2017-08-07 15:47:06 -05:00
Ch3LL
90a2fb66a2
Fix typo for template_dict in http docs
2017-08-07 16:45:42 -04:00
Nicole Thomas
da85326ad4
Merge pull request #42694 from gtmanfred/2016.11
...
allow adding extra remotes to a repository
2017-08-07 14:08:10 -04:00
Mike Place
7b2119feee
Merge pull request #42669 from garethgreenaway/42642_2016_11_augeas_module_fix
...
[2016.11] Fixes to augeas module
2017-08-06 12:58:02 -05:00
Seth House
de60b77c82
Workaround Orchestrate problem that highstate outputter mutates data
2017-08-04 13:01:50 -06:00
Adam Mendlik
f3dcfca4e0
Fix infinite loops on failed Windows deployments
2017-08-04 09:09:15 -06:00
Mike Place
30725769ed
Merge pull request #42629 from xiaoanyunfei/tornadoapi
...
tornado api
2017-08-03 17:21:19 -05:00
Mike Place
f0f00fcee1
Merge pull request #42655 from whiteinge/rest_cherrypy-reenable-stats
...
Reenable cpstats for rest_cherrypy
2017-08-03 15:44:10 -05:00
Mike Place
21cf15f9c3
Merge pull request #42693 from gilbsgilbs/fix-rabbitmq-tags
...
Fix RabbitMQ tags not properly set.
2017-08-03 15:23:08 -05:00
Daniel Wallace
1a0457af51
allow adding extra remotes to a repository
2017-08-02 10:30:29 -06:00
NLR
78fccdc7e2
Cast to list in case tags is a tuple.
2017-08-02 17:57:41 +02:00
NLR
287b57b5c5
Fix RabbitMQ tags not properly set.
2017-08-02 17:50:02 +02:00
Seth House
deb6316d67
Fix lint errors
2017-08-01 14:17:13 -06:00
