Merge branch 'master' into 'add-htcondor-info'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

@@ -25,8 +25,8 @@ test_navix_slc6_python34:
     - export XRD_INCDIR="/usr/include/xrootd"
     - cd /opt/xrootd-python && python3.4 setup.py install
     - cd /builds/ETP-HTC/NaviX
-    # - ulimit -n unlimited
-    - coverage run test_it.py && kill $(ps aux | grep 'NaviX.py' | awk '{print $2}')
+    - coverage run test_it.py
+    - kill $(ps aux | grep 'NaviX.py' | awk '{print $2}')
     - coverage report -m --omit=/usr/*,tests/*,test_it.py
 #    - source /opt/rh/rh-python34/enable