Nicole Thomas
31fd25b405
Merge pull request #20538 from s0undt3ch/hotfix/disable-py3-dict-fixes
...
Disable the modernize pylint plugin dict fixes
2015-02-09 19:57:09 -07:00
Mike Place
f122c9f6ba
Merge pull request #20481 from jacksontj/loader
...
Add submodule support to LazyLoader
2015-02-09 19:52:33 -07:00
Thomas Jackson
cf5157c533
Support arbitrarily deep modules
...
Note: salt can still only *call* modules on the first depth, but they can then import anything below
2015-02-09 17:51:06 -08:00
Thomas Jackson
7ea33b23ce
Change modulekey for submodule test-- to avoid namespace collisions
2015-02-09 17:51:05 -08:00
Thomas Jackson
ee69948dc4
pylint
2015-02-09 17:51:05 -08:00
Thomas Jackson
d869ce7e5f
Add support for submodules to LazyLoader
...
This was a feature that was inadvertently removed in #20274 , but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.
This includes the feature as well as tests.
2015-02-09 17:51:05 -08:00
Nicole Thomas
4b862f56b8
Merge pull request #20537 from rallytime/py-3-compat
...
More python 3 compatibility changes
2015-02-09 18:32:52 -07:00
Pedro Algarvio
b6101f7cb8
Disable the modernize pylint plugin dict fixes
2015-02-10 00:46:51 +00:00
rallytime
8b3a764bf8
Python 3 compat for flo/core.py
2015-02-09 17:17:43 -07:00
rallytime
4f1abf8d96
More Python 3 compat for linodepy.py
2015-02-09 17:15:33 -07:00
rallytime
3aa934abb4
Python 3 compat for haproxyconn_test.py
2015-02-09 17:14:04 -07:00
rallytime
bcafb5777f
Python 3 compat for osxdesktop_test.py
2015-02-09 17:13:09 -07:00
Mike Place
b0808ac46d
Merge pull request #20524 from rallytime/influx_test_Fix
...
Fix influx_test mocking
2015-02-09 12:45:59 -07:00
Nicole Thomas
73785a2e8c
Merge pull request #20519 from rallytime/pylint_develop
...
Pylint fixes for Develop
2015-02-09 12:06:56 -07:00
Nicole Thomas
530036df9e
Merge pull request #20521 from umeboshi2/fix-lvm-display-command
...
don't use empty string as command parameter
2015-02-09 12:03:21 -07:00
rallytime
a162e6b443
Fix influx_test mocking
2015-02-09 11:55:54 -07:00
rallytime
013454338d
Pylint fix for linodepy.py
2015-02-09 11:23:23 -07:00
Mike Place
9b9a546bc9
Merge pull request #20473 from jacksontj/develop
...
Add "disabled" support
2015-02-09 11:09:32 -07:00
Nicole Thomas
2f5fdd5da6
Merge pull request #20520 from jfindlay/add_upgrade
...
add support for upgrade in apt list upgrades
2015-02-09 11:00:04 -07:00
Joseph Rawson
ab7346be17
don't use empty string as command parameter
2015-02-09 11:28:41 -06:00
Justin Findlay
09b36a6b72
add support for upgrade in apt list upgrades
2015-02-09 10:24:00 -07:00
rallytime
bb9843d179
Don't forget the wait_for_sync arg in delete_record
2015-02-09 10:22:47 -07:00
Thomas S Hatch
97f91e5817
Merge pull request #20457 from cachedout/more_socket_iter
...
Iterate over the socket copy
2015-02-09 10:12:35 -07:00
Thomas S Hatch
75e3751c27
Merge pull request #20287 from garethgreenaway/20033_specify_gpghome
...
Changes to gpg.py module
2015-02-09 10:08:27 -07:00
rallytime
169ab05cf5
Python 3 compat for ssh_auth.py
2015-02-09 09:07:08 -07:00
rallytime
23ab69dec9
Python 3 compat for salt/modules/status.py
2015-02-09 09:04:40 -07:00
rallytime
15a64f0e08
Python 3 compat for flo/core.py
2015-02-09 09:02:52 -07:00
jfindlay
e0ceb40d94
Merge pull request #20513 from GregMSThompson/add_to_source_ip_tables
...
Added the option to-source to the after_jump list, to enable the config...
2015-02-09 08:29:20 -07:00
jfindlay
fea95c0866
Merge pull request #20517 from rupeshta/nagios_unit_tests
...
implemented unit test cases for nagios module
2015-02-09 08:28:24 -07:00
rallytime
1b3a89b048
Python 3 compat for win_status.py
2015-02-09 08:27:03 -07:00
jfindlay
23494674a8
Merge pull request #20516 from jayeshka/haproxyconn-unit-test
...
adding haproxyconn unit test case
2015-02-09 08:26:47 -07:00
rallytime
5708e05853
Python 3 compat for new linode driver
2015-02-09 08:24:27 -07:00
jfindlay
e1eabff9cd
Merge pull request #20515 from jayeshka/osxdesktop-unit-test
...
adding osxdesktop unit test case
2015-02-09 08:23:30 -07:00
Rupesh Tare
264b63b9df
implemented unit test cases for nagios module
2015-02-09 19:49:14 +05:30
Jayesh Kariya
d6101705b9
adding osxdesktop unit test case
2015-02-09 18:24:45 +05:30
Jayesh Kariya
d72afef3dd
adding haproxyconn unit test case
2015-02-09 18:23:22 +05:30
Greg Thompson
41039e0e03
Added the option to-source to the after_jump list, to enable the
...
configuration of SNAT rules with the iptables module.
2015-02-09 12:12:46 +00:00
Joseph Hall
dc73c308fc
Merge pull request #20501 from gtmanfred/develop
...
include rackconnectv3 variable
2015-02-07 20:01:21 -07:00
Daniel Wallace
a123e93760
add note about rackconnectv3 variable
2015-02-07 20:37:59 -06:00
Daniel Wallace
9448494ce1
fix rackconnect v3 implementation
2015-02-07 20:35:33 -06:00
jfindlay
b8deab5af9
Merge pull request #20497 from highlyunavailable/feature/influxdb_fixes
...
Fix influx API name warnings and user delete bug
2015-02-07 16:49:32 -07:00
jfindlay
3d64e24e53
Merge pull request #20491 from bechtoldt/requisites_article
...
add some cosmetic changes to the state requisites article
2015-02-07 16:37:39 -07:00
Highly Unavailable
cda2b65bf5
Fix more errors.
...
That'll teach me not to work in two places at once.
2015-02-07 14:52:08 -08:00
Highly Unavailable
8bea0241b8
Fix incorrect variable name
2015-02-07 14:33:59 -08:00
Highly Unavailable
826f32804c
Fix lint errors and make check more specific
2015-02-07 14:32:52 -08:00
Highly Unavailable
df7c09e616
Fix influx API name warnings and user delete bug
...
Some influxdb python API methods changed names and were generating
warnings every time this module was run.
The user_remove method had a bug that actually deleted the user you were
logged in as rather than the user you wanted to delete when run.
Added a method to test login for a user to see if they exist (mostly to
work around a use case described in #20496.) - for example to try logging
in as root:root to see if it's been deleted.
2015-02-07 13:15:39 -08:00
Arnold Bechtoldt
88dea95c6c
add some cosmetic changes to the state requisites article
2015-02-07 18:46:03 +01:00
jfindlay
654de6bc60
Merge pull request #20486 from l2ol33rt/fix_mint_17
...
Allow Linux Mint to use upstart
2015-02-06 20:51:52 -07:00
Seth House
60b960c33e
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-02-06 19:53:04 -07:00
Seth House
9a1a2db3aa
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-02-06 19:52:23 -07:00
