Merge branch 'master' into 8345-llfuse-unpin

Conflicts:
	jenkins/run-build-packages.sh

diff --cc jenkins/package-build-dockerfiles/centos6/Dockerfile
Simple merge

diff --cc jenkins/run-build-packages.sh
index d850cb2385ad89af1be2420e29b8e488a049803f,ec19b28866a0e39a3feecf2bf0715b397193ab47..ccea8a27b2db5a601b0abd23f38c394a5bbd0391
--- 1/jenkins/run-build-packages.sh
--- 2/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@@ -89,10 -89,10 +89,10 @@@ case "$TARGET" i
          PYTHON2_PKG_PREFIX=python
          PYTHON3_PACKAGE=python$PYTHON3_VERSION
          PYTHON3_PKG_PREFIX=python3
-         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
-             oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
              rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
 -            ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
 +            ciso8601 pycrypto backports.ssl_match_hostname llfuse \
              'pycurl<7.21.5')
          PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
          ;;
@@@ -102,10 -102,10 +102,10 @@@
          PYTHON2_PKG_PREFIX=python
          PYTHON3_PACKAGE=python$PYTHON3_VERSION
          PYTHON3_PKG_PREFIX=python3
-         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
-             oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
              rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
 -            ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
 +            ciso8601 pycrypto backports.ssl_match_hostname llfuse \
              'pycurl<7.21.5')
          PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
          ;;
@@@ -115,11 -115,10 +115,11 @@@
          PYTHON2_PKG_PREFIX=python
          PYTHON3_PACKAGE=python$PYTHON3_VERSION
          PYTHON3_PKG_PREFIX=python3
-         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
-             oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
              rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
 -            ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
 +            ciso8601 pycrypto backports.ssl_match_hostname llfuse \
 +            contextlib2 \
              'pycurl<7.21.5')
          PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
          ;;
@@@ -129,8 -128,8 +129,8 @@@
          PYTHON2_PKG_PREFIX=python
          PYTHON3_PACKAGE=python$PYTHON3_VERSION
          PYTHON3_PKG_PREFIX=python3
 -        PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
 +        PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse ciso8601 \
-             google-api-python-client six uritemplate oauth2client httplib2 \
+             google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \
              rsa 'pycurl<7.21.5' backports.ssl_match_hostname)
          PYTHON3_BACKPORTS=(docker-py requests websocket-client)
          ;;
@@@ -140,11 -139,11 +140,11 @@@
          PYTHON2_PKG_PREFIX=$PYTHON2_PACKAGE
          PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
          PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
-         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
-             oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+         PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
              rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
              ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \
 -            python-daemon lockfile llfuse==0.41.1 'pbr<1.0')
 +            python-daemon lockfile llfuse 'pbr<1.0')
          PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
          export PYCURL_SSL_LIBRARY=nss
          ;;

diff --cc jenkins/run-library.sh
Simple merge