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
Erik Johnson
e97d4635cd
Merge branch 'crasu-2014.7' into 2014.7
2015-02-09 09:52:39 -06:00
Christian Kraemer
56653cbfd5
Added closing of filehandle and removal of gitfs update.lk
2015-02-09 09:52:26 -06:00
Christian Kraemer
083b39e467
#18839 more linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
477d6d5d74
#18839 more linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
25da94c174
#18839 more linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
f28a5f164b
#18839 linter fixes
2015-02-09 09:51:18 -06:00
Christian Kraemer
434224ba0d
Fix file locking for gits fs see #18839
2015-02-09 09:51:18 -06: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
jfindlay
f9e1e43ec9
Merge pull request #20510 from eliasp/2014.7-issue-18689
...
Fix #18689 by handling psutil exceptions.
2015-02-09 08:11:12 -07:00
Elias Probst
35baba9e54
Fix #18689 by handling psutil exceptions.
...
The information of some processes can't be accessed on Windows when
they're run under the 'LOCAL SERVICE' account.
This caused exceptions which bubbled up into `ps.pgrep` and caused
there backtraces as described in #18689 .
2015-02-09 16:06:59 +01:00
Alexander Schwartz
c05aae9ce7
added archive test script
2015-02-09 14:52:46 +00:00
