valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,382 Commits 24 Branches 182 Tags 341 MiB
f972c39333
Commit Graph

27 Commits

Author SHA1 Message Date
Colton Myers
6530a20340 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    pkg/suse/salt.changes
    salt/modules/lxc.py
    salt/modules/ps.py
    salt/states/cloud.py
 2015-05-18 11:39:43 -06:00
Weilu Jia
64634b6349 Update psutil.pid_list to use psutil.pids 2015-05-15 14:25:03 -07:00
Weilu Jia
8a1da33ada Fix test cases by mocking psutil_compat 2015-05-15 14:11:12 -07:00
Weilu Jia
7d02ad4f06 Fix some of the mock names for the new API 2015-05-15 13:03:26 -07:00
Weilu Jia
93ee411fd5 Create compatability psutil. 
psutil 3.0 drops 1.0 API, but we still support old psutil versions.
 2015-05-15 13:03:25 -07:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
rallytime
0e57d8fe6e Fix pylint errors on develop 2015-02-23 12:24:53 -07:00
Chris Rebert
ea02ef58b7 re-enable pylint instead of disabling it twice 2015-02-20 23:50:30 -08:00
Pedro Algarvio
d3acb194df Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -07:00
Gareth J. Greenaway
9ae138e1a4 Fixing the unit tests for ps module 2014-10-07 20:56:02 -07:00
rallytime
e8fab3d28a Fix psutil version 2014-08-14 21:22:55 -06:00
rallytime
0683c704dd Move psutil version check 2014-08-14 21:20:25 -06:00
rallytime
8dca2515ee Skip virtual_memory and swap_memory tests if psutil < 0.6.0 2014-08-14 16:16:38 -06:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
btibi
9eeed00382 ps: add partial psutil 2.0 compatibility 2014-07-09 19:54:25 +02:00
David Boucha
9dc182a2f4 fix codeauthor misspellings 2014-05-21 18:59:02 -06:00
Pedro Algarvio
03f66d6874 Allow standalone execution 2014-03-31 02:42:36 +01:00
Pedro Algarvio
e20715c2ac Ignore unused imports 2014-02-08 08:03:23 +00:00
Erik Johnson
35c397d14b Fix test failures 
http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/
 2014-02-01 16:51:48 -06:00
Ted Strzalkowski
488dd52e2c Added unit tests for new psutil features. 2014-02-01 13:22:44 -08:00
Mike Place
b6aa95d2ab Fix psutil on Arch. 2013-12-30 16:41:45 -07:00
Mike Place
bd2ec30682 Correct failure when psutil is not installed. 
Reformatting.
 2013-12-18 09:25:04 -07:00
Mike Place
d7b7ad3b9f More ps exec module unit tests. 2013-12-17 11:23:49 -07:00
Mike Place
20ab5b2d23 Lint. 2013-12-16 17:09:49 -07:00
Mike Place
26aa30393e Unit testing of ps exec module. 
Seemed like this would be sort of mundane but there are actually a few dragons here.
Unit testing turned up the fact that we make use of methods in psutil that are deprecated!
 2013-12-16 17:05:53 -07:00