Pedro Algarvio
|
81ef4ccdf6
|
Merge pull request #25032 from techhat/spm
Remove .yml from FORMULA and SPM-METADATA
|
2015-06-29 16:18:09 +01:00 |
|
Pedro Algarvio
|
a138a7b83c
|
SPM also works on windows
|
2015-06-29 15:51:12 +01:00 |
|
Pedro Algarvio
|
ac086c9311
|
Add the spm script to setup.py
|
2015-06-29 15:49:48 +01:00 |
|
Pedro Algarvio
|
b86ff4dc90
|
Move SPM's parser to salt.utils.parsers and add -y to it
|
2015-06-29 15:49:01 +01:00 |
|
Joseph Hall
|
27eb174e61
|
Remove .yml from FORMULA and SPM-METADATA
|
2015-06-29 08:36:14 -06:00 |
|
Mike Place
|
4af15cfb90
|
Merge pull request #24987 from heewa/fix-trying-to-cache-no-file
Don't try to cache a template when it's not a file
|
2015-06-29 08:02:59 -06:00 |
|
Mike Place
|
cfd904d3a8
|
Merge pull request #25020 from martinhoefling/develop
Fix for issue #25016
|
2015-06-29 08:01:02 -06:00 |
|
Mike Place
|
596567315e
|
Merge pull request #24989 from htch/develop
Log traceback on 'Function in mine_functions failed to execute' exceptions in mine.update
|
2015-06-29 07:54:42 -06:00 |
|
Mike Place
|
47df4723ad
|
Merge pull request #25015 from bechtoldt/http_util
add fixes and enhancements to salt.utils.http
|
2015-06-29 07:53:33 -06:00 |
|
Mike Place
|
8eeaddbff4
|
Merge pull request #25022 from jfindlay/label_docs
revise label and milestone documentation
|
2015-06-29 07:51:24 -06:00 |
|
Mike Place
|
89c2e01ac1
|
Merge pull request #25029 from jayeshka/redismod-unit-test
adding redismod unit test case.
|
2015-06-29 07:50:33 -06:00 |
|
Jayesh Kariya
|
e3045be5a9
|
adding redismod unit test case.
|
2015-06-29 14:13:45 +05:30 |
|
Joseph Hall
|
64cdd85584
|
Merge pull request #25023 from pengyao/schedule_typo
fixed a typo
|
2015-06-28 07:25:48 -06:00 |
|
pengyao
|
083f879afd
|
a typo
|
2015-06-28 20:27:49 +08:00 |
|
Justin Findlay
|
ae65c0f759
|
Merge pull request #25019 from bechtoldt/update_docs_2
add missing module documentation to references
|
2015-06-27 16:43:36 -06:00 |
|
Justin Findlay
|
a5d2dca93d
|
Merge pull request #25012 from notpeter/source_hash_file
Add file as supported protocol for file source_hash
|
2015-06-27 16:39:03 -06:00 |
|
Justin Findlay
|
a7154e7471
|
Merge pull request #25011 from notpeter/s3_2014.7_backport
Add s3 to protocols for remote source_hash (2014.7 backport)
|
2015-06-27 16:35:44 -06:00 |
|
Justin Findlay
|
d41ee6d4e0
|
Merge pull request #25009 from aboe76/fix_mod_random.seed
Fix documentation on mod_random.seed module
|
2015-06-27 16:34:19 -06:00 |
|
Justin Findlay
|
b7654aeacc
|
Merge pull request #25001 from jasonkeene/clarify-ssh-know-hosts-docs
Add docs for key arg in ssh_known_hosts.present
|
2015-06-27 16:30:54 -06:00 |
|
Justin Findlay
|
642525298c
|
Merge pull request #24995 from rallytime/tops_mongo
Fix deprecated pymongo usage causing errors in latest pymongo
|
2015-06-27 16:28:56 -06:00 |
|
Justin Findlay
|
e9aaa11b68
|
Merge pull request #24994 from garethgreenaway/2015_5_24862_gpg_import_key
Another Fix to gpg.py in 2015.5
|
2015-06-27 16:28:15 -06:00 |
|
Justin Findlay
|
ebd666e5ee
|
Merge pull request #24988 from jayeshka/supervisord-states-unit-test
adding states/supervisord unit test case.
|
2015-06-27 16:24:42 -06:00 |
|
Justin Findlay
|
8575192cc4
|
revise label and milestone documentation
|
2015-06-27 16:17:44 -06:00 |
|
Martin Hoefling
|
8b4aeffb4c
|
Fix for issue #25016
|
2015-06-27 22:32:09 +02:00 |
|
Gideon Redelinghuys
|
cb051201cf
|
Introduce ip:port minion config
|
2015-06-27 11:59:31 -07:00 |
|
Arnold Bechtoldt
|
689ba5686b
|
add missing module documentation to references
|
2015-06-27 19:12:50 +02:00 |
|
Arnold Bechtoldt
|
a920216788
|
update linode cloud driver examples
|
2015-06-27 17:00:58 +02:00 |
|
Arnold Bechtoldt
|
1d93e3acc7
|
enhance new linode driver implementation by @rallytime
* bring back support for #12006 / #11996 (private_ip)
* fix _wait_for_job (near-endless looping)
|
2015-06-27 16:08:40 +02:00 |
|
Arnold Bechtoldt
|
6e61a3f390
|
improve linode http API query usage
|
2015-06-27 13:24:23 +02:00 |
|
Arnold Bechtoldt
|
9655b2b90a
|
add fixes and enhancements to salt.utils.http
* improve logging
* fix unused GET params when using urllib2 backend
|
2015-06-27 13:04:04 +02:00 |
|
Peter Tripp
|
1a6fb8078b
|
Add file as supported protocol for file source_hash. Fixes #23764.
|
2015-06-26 16:21:45 -07:00 |
|
Nicole Thomas
|
a880fbcd96
|
Merge pull request #24982 from asyncsrc/develop
ec2 network_interfaces fix
|
2015-06-26 15:51:55 -06:00 |
|
Colton Myers
|
0487c3c59b
|
Merge pull request #25007 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2015-06-26 15:28:57 -06:00 |
|
Mark McGuire
|
8b8af640f6
|
Add s3 to protocols for remote source_hash
|
2015-06-26 13:59:17 -07:00 |
|
Niels Abspoel
|
1cda19ab93
|
Fix documentation on mod_random.seed module
|
2015-06-26 22:38:43 +02:00 |
|
Colton Myers
|
4980fd547b
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
salt/modules/ps.py
tests/unit/modules/ps_test.py
|
2015-06-26 14:02:46 -06:00 |
|
jacobhammons
|
91a60e198e
|
Merge pull request #25003 from jacobhammons/man-pages
Updated man pages
|
2015-06-26 13:13:41 -06:00 |
|
jacobhammons
|
a60a2c4222
|
Merge pull request #25002 from jacobhammons/doc-announcements
sphinx html theme updates
|
2015-06-26 12:39:13 -06:00 |
|
jacobhammons
|
76251e54b1
|
Merge pull request #24998 from jacobhammons/build-man-pages
rebuilt man pages, versioned html theme css
|
2015-06-26 12:39:02 -06:00 |
|
Jacob Hammons
|
cf97a4ab17
|
Updated man pages
|
2015-06-26 12:21:26 -06:00 |
|
Jason Keene
|
4cef4ac683
|
Add docs for key arg in ssh_known_hosts.present
|
2015-06-26 13:20:07 -04:00 |
|
Jacob Hammons
|
f88f344a28
|
sphinx html theme updates
|
2015-06-26 11:13:56 -06:00 |
|
rallytime
|
1e81a88625
|
Clean up
|
2015-06-26 11:07:04 -06:00 |
|
Jacob Hammons
|
30a907576c
|
rebuilt man pages, versioned html theme css
|
2015-06-26 11:06:21 -06:00 |
|
rallytime
|
be19a6730e
|
Provide a less confusing error when cloud provider is misconfigured
|
2015-06-26 11:05:04 -06:00 |
|
jacobhammons
|
9f8cef2b8a
|
Merge pull request #24993 from jacobhammons/doc-theme
sphinx html theme updates - color changes for warning on development …
|
2015-06-26 10:28:51 -06:00 |
|
Trevor H
|
a3c1063a37
|
fix deprecated pymongo usage causing errors in latest pymongo
|
2015-06-26 10:00:29 -06:00 |
|
David Boucha
|
99d2fd109a
|
update docs to reflect new win rep changes
|
2015-06-26 09:58:47 -06:00 |
|
David Boucha
|
5048ccfbb6
|
catch render exceptions
|
2015-06-26 09:58:47 -06:00 |
|
David Boucha
|
9d6d3f4a7e
|
split the log out
|
2015-06-26 09:58:47 -06:00 |
|