Commit Graph

81189 Commits

Author SHA1 Message Date
Super-User
db6eadd6c3 update oxygen release notes for grains deprecation 2017-04-26 23:30:53 +02:00
Mike Place
d93841898f Merge pull request #40901 from ender8282/develop
Add support for KDE neon
2017-04-26 13:51:09 -06:00
Mike Place
34708956ed Merge pull request #40892 from StreetHawkInc/develop
add minion function to reload beacon #35960
2017-04-26 12:10:30 -06:00
John Hubbard
6a2c320b9b Added support for KDE neon
Updated _OS_MAP_NAME and  _OS_FAMILY_MAP to map 'neon' into 'KDE neon' and to associate that with the Debian. 
For details about KDE neon see neon.kde.org
2017-04-26 10:23:38 -07:00
Mike Place
7a63e3cfd2 Merge pull request #40668 from grep4linux/new_xen_cloud_driver
new Xen cloud driver
2017-04-26 10:59:38 -06:00
Nicole Thomas
000f8f7952 Merge pull request #40875 from Absolight/fix-pkgng-upgrade
Remove some more raw string formatting forgotten in f4fb771.
2017-04-26 10:08:17 -06:00
Nicole Thomas
c710ac8ebd Merge pull request #40842 from hujunya/bugfix/redis_clean_old_jobs
fix redis returner clean_old_jobs
2017-04-26 10:05:25 -06:00
Nicole Thomas
76d6419cfd Merge pull request #40868 from gtmanfred/develop
Add Zookeeper tests
2017-04-26 09:44:16 -06:00
Steven Joseph
f65bb02d73 add minion function to reload beacon #35960 2017-04-26 15:17:00 +10:00
Daniel Wallace
2ad5025ecb add doc for make_digest_acl 2017-04-25 17:26:29 -06:00
Nicole Thomas
d14def6454 Merge pull request #40874 from tonybaloney/libcloud_load_balancer_states
Add Apache Libcloud Load Balancer State module
2017-04-25 16:45:40 -06:00
Daniel Wallace
eb24f5381a fix pylint 2017-04-25 15:26:12 -06:00
Nicole Thomas
8305ff66ce Merge pull request #40885 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-25 14:12:32 -06:00
Daniel Wallace
f3825d3f5e skip tests if kazoo is not installed 2017-04-25 12:20:35 -06:00
Nicole Thomas
434e8082ba Quick lint fix for liblcoud_loadbalancer
Added whitespace after `:`
2017-04-25 11:32:02 -06:00
rallytime
d7831c451c Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-25 11:09:01 -06:00
Mathieu Arnold
f70ca0f91d Remove some more raw string formatting forgotten in f4fb771.
Running pkg.upgrade without arguments worked, it was generating
`pkg upgrade --y` which is all right because the only possibility is
`--yes`.  But when running, for example, with dryrun=True, it ended up
generating `pkg upgrade --n` and `--n` and there are more than one
option that starts with `n`, `--no-install-scripts`, `--dry-run` and
`--no-repo-update`.
2017-04-25 13:54:45 +02:00
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test 2017-04-25 21:47:38 +10:00
Anthony Shaw
74b955004b
add docs for new state modules 2017-04-25 21:32:13 +10:00
Anthony Shaw
76bdcabe1e
add commands for adding and removing members from a balancer 2017-04-25 21:28:47 +10:00
Anthony Shaw
8caf26a6a3
fixed the storage state module expecting a class instance, when I switched the responses to dictionaries 2017-04-25 21:18:17 +10:00
Anthony Shaw
3a15b9d4c2
add basic state module for load balancers 2017-04-25 21:15:50 +10:00
Anthony Shaw
867e6c1ce5
tests for load balancer and lint for other modules, fixes for load balancer 2017-04-25 21:07:27 +10:00
Anthony Shaw
5f03b7a506
tests for load balancer and fixed issue with destroy balancer 2017-04-25 20:44:36 +10:00
Anthony Shaw
bb4ec6c4db
tests for the storage module 2017-04-25 20:27:52 +10:00
Anthony Shaw
27b8849ede
add existing libcloud modules to doc index 2017-04-25 17:17:18 +10:00
Mike Place
25a438a4e1 Merge pull request #40750 from pcn/add-aws-detailed-monitoring-toggle
Add aws detailed monitoring toggle
2017-04-24 22:41:20 -06:00
Mike Place
5d9dd3ad56 Merge pull request #40805 from terminalmage/moby
Alias moby to docker in Nitrogen (and later)
2017-04-24 22:37:53 -06:00
Mike Place
d5c781b40b Merge pull request #40858 from rallytime/locale-fixes
Use locale_search_str variable in locale.gen_locale and add error handling to integration test
2017-04-24 22:32:48 -06:00
Mike Place
8a7f7af5d8 Merge pull request #40863 from BenoitKnecht/support-systemd-on-cumulus-linux
modules: service: support Systemd on Cumulus Linux
2017-04-24 22:25:55 -06:00
Erik Johnson
d9fc14b6c6 Fix docker.push/pull
Resolves https://github.com/saltstack/salt/issues/40864
2017-04-24 18:01:18 -06:00
Daniel Wallace
0ee3ecf464 Add tests for Zookeeper states 2017-04-24 18:01:16 -06:00
Nicole Thomas
eb8fd68154 Merge pull request #40844 from tonybaloney/libcloud_storage
Added execution and state modules for Apache Libcloud
2017-04-24 17:10:33 -06:00
Nicole Thomas
506e8f7fbc Merge pull request #40847 from tonybaloney/libcloud_load_balancer
Add execution module for Apache Libcloud load balancer API
2017-04-24 17:09:36 -06:00
Nicole Thomas
6576175ff1 Merge pull request #40867 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-24 17:07:22 -06:00
Raine Curtis
51b43640fa removed superfluous-parens on lines 291,450 2017-04-24 16:27:03 -06:00
rallytime
a1f9ae67e1 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-24 15:37:09 -06:00
Anthony Shaw
697dce824d Merge branch 'libcloud_load_balancer' of github.com:tonybaloney/salt into libcloud_load_balancer 2017-04-25 07:30:51 +10:00
Anthony Shaw
2a6b3bd374 Merge branch 'develop' into libcloud_load_balancer 2017-04-25 07:29:15 +10:00
Anthony Shaw
267143686b lint fixes and merged develop 2017-04-25 07:27:51 +10:00
Anthony Shaw
2ec6da0383 Merge branch 'develop' into libcloud_storage 2017-04-25 07:25:57 +10:00
rallytime
46684f6f69 Typo: locale should be "locale_info" dictionary 2017-04-24 15:22:25 -06:00
rallytime
44623863fa Clean up integration test checks to be more encompassing 2017-04-24 15:12:20 -06:00
rallytime
5d8878dfdc Remove "is not None" checks salt.utils.which if statements
These checks are extraneous as salt.utils.which either returns
a path or "None".
2017-04-24 14:59:48 -06:00
Benoît Knecht
a492bd4ac2 modules: service: support Systemd on Cumulus Linux
Cumulus Linux is Debian-based and uses Systemd as its init system.

This commit prevents the minion from trying to use SysVinit on Cumulus Linux
and failing with `ERROR: Unable to run command [...] No such file or
directory`.
2017-04-24 22:13:00 +02:00
Raine Curtis
c567f50da7 cleaned up more to pep8 standards, added cloud cache node 2017-04-24 13:37:44 -06:00
rallytime
3dc93be6f6 Skip test if no charmaps are found
The "loacle -m" command might not return an error, but it might
just be empty. Let's not fail on a test that we're already logging
to the user.
2017-04-24 12:38:49 -06:00
rallytime
7efebc9f78 Remove assertion against an empty string
Returning an empty string is the expected behavior if the locale
is not set. This happens for example on the Fedora 24 test boxes.
2017-04-24 12:19:06 -06:00
rallytime
e3550ab44c Skip gen_locale test if charmaps aren't available on the test machine
The error of missing charmaps gets logged to the user. We shouldn't
be running the test for the gen_locale if we don't have charmaps
available on the test machine.
2017-04-24 12:17:29 -06:00
rallytime
532cefe62e localemod.gen_locale add locale_search_str var to reduce confusion
Add some spacing for easier readability
2017-04-24 12:15:43 -06:00