Justin Findlay
d6dc6f97b5
versionadded
...
Fixes #24747 .
2015-06-29 10:53:37 -06:00
Justin Findlay
28c87cab17
Merge pull request #24747 from msciciel/2015.5
...
add get_route function to network module
2015-06-29 10:51:42 -06:00
Thomas S Hatch
46a96773aa
Merge pull request #24975 from lyft/npm-module-fix
...
Fix update of undefined env var in npm module
2015-06-29 09:45:05 -07:00
Thomas S Hatch
9cf8550cd8
Merge pull request #24986 from heewa/fix-pkg-hold-when-errored
...
Don't modify empty change
2015-06-29 09:44:17 -07:00
Thomas S Hatch
ece897d8d6
Merge pull request #24999 from rallytime/cloud_error_help
...
Provide a less confusing error when cloud provider is misconfigured
2015-06-29 09:43:31 -07: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
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
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
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
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
Jacob Hammons
cf97a4ab17
Updated man pages
2015-06-26 12:21:26 -06: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
rallytime
be19a6730e
Provide a less confusing error when cloud provider is misconfigured
2015-06-26 11:05:04 -06:00
Trevor H
a3c1063a37
fix deprecated pymongo usage causing errors in latest pymongo
2015-06-26 10:00:29 -06:00
Gareth J. Greenaway
d2f0d8fa96
variable was referenced before assignment. Just removing the variable and checking the return from distutils.version.LooseVersion directly.
2015-06-26 07:25:37 -07:00
Jayesh Kariya
bb0a6d5625
adding states/supervisord unit test case.
2015-06-26 13:06:53 +05:30
Heewa Barfchin
9ae0c78ffc
Don't try to cache a template when it's not a file
2015-06-25 23:28:01 -04:00
Heewa Barfchin
d47a448a80
Don't modify empty change
2015-06-25 22:11:15 -04:00
Pedro Algarvio
a791b23ff9
Merge pull request #24977 from rallytime/do_move_warning
...
Only warn about digital ocean deprecation if digital ocean is configured
2015-06-26 00:54:46 +01:00
Ryan Lane
6fde58182f
Try byte literals rather than unicode strings in the env
2015-06-25 15:35:24 -07:00
rallytime
6b544227ab
Only warn about digital ocean deprecation if digital ocean is configured
2015-06-25 16:00:33 -06:00
Ryan Lane
c8514de334
Fix update of undefined env var in npm module
2015-06-25 14:55:14 -07:00
Mike Place
a71c1b7c8b
Merge pull request #24966 from garethgreenaway/2015_5_24862_gpg_import_key
...
Fixes to gpg.py in 2015.5
2015-06-25 13:58:49 -06:00
Mike Place
86221846ac
Merge pull request #24965 from jacksontj/2015.5
...
Fix memory leak in saltnado
2015-06-25 12:48:03 -06:00
Gareth J. Greenaway
55eb73b0c9
fixing unit tests.
2015-06-25 11:33:36 -07:00
Thomas Jackson
48b5e1653e
pylint
2015-06-25 10:13:08 -07:00
Gareth J. Greenaway
80c24be4fe
Fixing an issue with the import_key method. Different results depending on which gnupg python module is installed.
2015-06-25 09:15:52 -07:00
Thomas Jackson
87adca46e0
Fix memory leak in saltnado
...
Fixes #24846
If an event was checked after the request was closed out it was possible for requests to get into the event_listener's mapping and never be cleaned out. This fixes the leak by checking if the request is open or not before adding it to the mappings.
2015-06-25 09:06:33 -07:00
Mike Place
773c4cf8e4
Merge pull request #24948 from jfindlay/doc_links
...
fix some malformed doc links and anchors
2015-06-25 09:51:38 -06:00
Mike Place
4ebc01e662
Merge pull request #24886 from alprs/fix-root_dir_bug
...
Be more careful about stripping away root_dir from directory options
2015-06-25 09:50:11 -06:00
C. R. Oldham
a11e4c6eea
Merge pull request #24944 from techhat/issue24915
...
Double-check main_cloud_config
2015-06-25 06:29:55 -06:00
Justin Findlay
152a9b2a12
fix some malformed doc links and anchors
2015-06-24 16:56:52 -06:00
Justin Findlay
d26a5447ba
Merge pull request #24936 from jtand/psutil
...
Fixed ps module to not use depreciated psutil commands
2015-06-24 16:38:19 -06:00
Mike Place
f52f7e1d20
Merge pull request #24930 from jacksontj/2015.5
...
Don't refetch file templates 100% of the time-- Performance optimization for templated files
2015-06-24 15:22:46 -06:00
Joseph Hall
59c3081e49
Double-check main_cloud_config
2015-06-24 14:42:37 -06:00
Andreas Lutro
52ccafded3
os.sep is the correct directory separator constant
2015-06-24 22:35:16 +02:00
Thomas Jackson
5fb75346ef
Only parse the source if we have one
2015-06-24 12:31:51 -07:00
Thomas Jackson
c03a6fa9d1
Add support for sources of managed files to be local
2015-06-24 11:20:38 -07:00
Thomas Jackson
4cf78a0a95
pylint
2015-06-24 11:20:33 -07:00
Justin Findlay
925a4d91ba
Merge pull request #24935 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-24 12:17:54 -06:00
justinta89
bdb7a19c36
Fixed ps module to not use depreciated psutil commands
2015-06-24 11:31:07 -06:00
Andreas Lutro
0ecbf261ad
Be more careful about stripping away root_dir from directory options
...
Closes #24885
2015-06-24 19:25:09 +02:00
