Commit Graph

46954 Commits

Author SHA1 Message Date
Damian Myerscough
4ee43e957f Initial Kerberos Management 2015-02-09 22:08:11 -08:00
Jayesh Kariya
511a496946 resolved the error 2015-02-10 11:28:01 +05:30
Pedro Algarvio
f232f7f9fe Merge pull request #20542 from saltstack/revert-20537-py-3-compat
Revert "More python 3 compatibility changes"
2015-02-10 04:51:06 +00:00
Nicole Thomas
a0d5c3dc79 Revert "More python 3 compatibility changes" 2015-02-09 19:57:38 -07:00
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
Ahmed Kamal
dfeaa19b0e Linter happiness 2015-02-10 04:54:17 +02:00
Mike Place
f122c9f6ba Merge pull request #20481 from jacksontj/loader
Add submodule support to LazyLoader
2015-02-09 19:52:33 -07:00
Ahmed Kamal
aa5ae496e0 Add support for upgrading named packages on FreeBSD pkgng 2015-02-10 04:38:20 +02:00
toppur
cdbaff63b7 Update formulas.rst
There's not keyword named 'base' here, should be 'default'.
2015-02-09 18:24:11 -08: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
523a8f8962 Merge pull request #20534 from rallytime/bp-20454
Backport #20454 to 2014.7
2015-02-09 18:34:10 -07: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
Nicole Thomas
a6fa35a6e6 Merge pull request #20533 from rallytime/bp-20521
Backport #20521 to 2014.7
2015-02-09 18:32:01 -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
Nicole Thomas
3e2e9e3861 Merge pull request #20532 from rallytime/bp-20501
Backport #20501 to 2015.2
2015-02-09 17:10:30 -07:00
Nicole Thomas
525f00cb44 Merge pull request #20529 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
2015-02-09 17:09:57 -07:00
Andrii Krykunenko
f1aa6931a4 Fix wrong check for rvm script existence 2015-02-09 16:56:38 -07:00
Joseph Rawson
3fc398e1b2 don't use empty string as command parameter 2015-02-09 16:50:54 -07:00
Daniel Wallace
7d70cd19c4 add note about rackconnectv3 variable 2015-02-09 16:12:33 -07:00
Daniel Wallace
bbab6235e0 fix rackconnect v3 implementation 2015-02-09 16:12:33 -07:00
Ahmed Kamal
9dfb45953a Linter happiness 2015-02-10 00:49:42 +02:00
Ahmed Kamal
d373577788 Add Linux kernel module checker 2015-02-10 00:39:43 +02:00
Colton Myers
eba17606b4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-09 15:37:25 -07:00
Ahmed Kamal
da6395f202 Dont load module, if zfs kernel module is not loaded 2015-02-10 00:30:21 +02:00
jfindlay
9246f64f9b Merge pull request #20523 from terminalmage/fix-kwarg-parsing
Fix regression in arg parsing
2015-02-09 12:55:22 -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
Erik Johnson
ebf9a9b9d6 Fix regression in arg parsing
This keeps kwargs with newlines in them from being misidentifed as
positional rather than keyword arguments.
2015-02-09 12:36:21 -06:00
rallytime
013454338d Pylint fix for linodepy.py 2015-02-09 11:23:23 -07:00
Aaron Bell
3b25ff1a4f fixing for lint 2015-02-09 10:21:30 -08: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
Erik Johnson
3e321fdb48 Add file-locking bugfix to 2014.7.2 release notes 2015-02-09 11:32:20 -06: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