Merge branch 'master' into 8345-llfuse-unpin
authorTom Clegg <tom@curoverse.com>
Sat, 20 Feb 2016 09:49:20 +0000 (04:49 -0500)
committerTom Clegg <tom@curoverse.com>
Sat, 20 Feb 2016 09:49:20 +0000 (04:49 -0500)
commitd7bda40439a964ab2117933aba3694cb635e23dc
tree3d047b81677f06aef107c9d37fdbf816fd45bd30
parent07c05348740cd932e54aecfa52bf2a1260b3948e
parent65a3779e6968835bc0b1fc1b103a408fd4eec4aa
Merge branch 'master' into 8345-llfuse-unpin

Conflicts:
jenkins/run-build-packages.sh
jenkins/package-build-dockerfiles/centos6/Dockerfile
jenkins/run-build-packages.sh
jenkins/run-library.sh