Merge branch 'release_2.3.1' into stable

* release_2.3.1:
  Add 2.3.1 to the reprepro distribution manifest
  Update version to 2.3.1 and update changelog
  Remove unused time import
  Fix proot controlpersist cleanup issue

awx/__init__.py

@@ -6,7 +6,7 @@ import sys
 import warnings
 import site
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'
 
 __all__ = ['__version__']
 

awx/plugins/callback/job_event_callback.py

@@ -37,7 +37,6 @@ import logging
 import os
 import pwd
 import urlparse
-import time
 
 # Requests
 import requests
@@ -45,12 +44,7 @@ import requests
 # ZeroMQ
 import zmq
 
-# PSUtil
-try:
-    import psutil
-except ImportError:
-    psutil = None
-
+import psutil
 
 class TokenAuth(requests.auth.AuthBase):
 
@@ -249,19 +243,14 @@ class BaseCallbackModule(object):
         if not cp_files:
             return
 
-        # HACK: If psutil isn't available, sleep and allow the control master
-        # processes to timeout and die.
-        if not psutil:
-            time.sleep(60)
-
         # Attempt to find any running control master processes.
         username = pwd.getpwuid(os.getuid())[0]
         ssh_cm_procs = []
         for proc in psutil.process_iter():
             try:
-                pname = proc.name
-                pcmdline = proc.cmdline
-                pusername = proc.username
+                pname = proc.name()
+                pcmdline = proc.cmdline()
+                pusername = proc.username()
             except psutil.NoSuchProcess:
                 continue
             if pusername != username:
@@ -277,19 +266,7 @@ class BaseCallbackModule(object):
         # version of psutil that may not have wait_procs implemented.
         for proc in ssh_cm_procs:
             proc.terminate()
-        if hasattr(psutil, 'wait_procs'):
-            procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5)
-        else:
-            procs_gone = []
-            procs_alive = ssh_cm_procs[:]
-            for x in xrange(5):
-                for proc in procs_alive[:]:
-                    if not proc.is_running():
-                        procs_alive.remove(proc)
-                        procs_gone.append(proc)
-                if not procs_alive:
-                    break
-                time.sleep(1)
+        procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5)
         for proc in procs_alive:
             proc.kill()