summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* .gitlab-ci.yml: Build ci.morph in master and release/ branchesrelease/jjardon/testingJavier Jardón2017-02-011-0/+18
* Merge branch 'jjardon/change_docker_image' into 'master' Javier Jardón2017-01-311-1/+1
|\
| * .gitlab-ci.yml: Use debian:jessie instead python:2.7-slim by defaultJavier Jardón2017-01-311-1/+1
|/
* Merge branch 'jjardon/remove_system_pip' into 'master' Javier Jardón2017-01-311-1/+4
|\
| * install_dependencies.sh: Upgrade installed packages if neededJavier Jardón2017-01-301-1/+1
| * install_dependencies.sh: Remove system-installed python pip packageJavier Jardón2017-01-301-0/+3
|/
* Merge branch 'ps-fix-250' into 'master' devcurmudgeon2017-01-302-1/+6
|\
| * Fix #250 - don't leak kbas user:pass in logsps-fix-250Paul Sherwood2017-01-302-1/+6
|/
* Merge branch 'ps-fresh-tmpdir' into 'master' Javier Jardón2017-01-301-1/+2
|\
| * Don't attempt to re-use tmpdirPaul Sherwood2017-01-301-1/+2
|/
* Merge branch 'jjardon/test_distros' into 'master' devcurmudgeon2017-01-302-13/+51
|\
| * .gitlab-ci.yml: Check ybd works in several distrosJavier Jardón2017-01-301-3/+34
| * install_dependencies.sh: Update pip if possibleJavier Jardón2017-01-301-0/+2
| * Revert "install_dependencies.sh: Install python-pip from the distro packages"Javier Jardón2017-01-301-5/+11
| * install_dependencies.sh: python headers are needed to compile some python pac...Javier Jardón2017-01-301-3/+3
| * install_dependencies.sh: Fedora needs redhat-rpm-configJavier Jardón2017-01-301-1/+1
| * install_dependencies.sh: Do not use whichJavier Jardón2017-01-301-4/+4
| * Add git to install_dependencies.shJavier Jardón2017-01-302-5/+4
|/
* Merge branch 'jjardon/ci-deploy' into 'master' devcurmudgeon2017-01-291-1/+8
|\
| * .gitlab-ci.yml: Add a deployment stepJavier Jardón2017-01-291-0/+7
| * .gitlab-ci.yml: Build the chroot variant of the minimal systemJavier Jardón2017-01-291-1/+1
|/
* Merge branch 'jjardon/pep8' into 'master' devcurmudgeon2017-01-295-7/+7
|\
| * Use pycodestyle (formerly called pep8) to check python code styleJavier Jardón2017-01-293-3/+3
| * Do not use 'l' as a variableJavier Jardón2017-01-292-4/+4
|/
* Merge branch 'jjardon/pip_improvements' into 'master' devcurmudgeon2017-01-221-11/+5
|\
| * install_dependencies.sh: Install python-pip from the distro packagesJavier Jardón2017-01-211-11/+5
|/
* Merge branch 'lc/copy_fs' into 'master' Ben Brown2016-12-132-17/+2
|\
| * Replace copy_all_files with copy_fsDaniel Firth2016-12-132-17/+2
|/
* Merge branch 'lc/precise_dependencies' into 'master' Javier Jardón2016-12-131-1/+1
|\
| * Use the precise dependencies to stop breakage in master.Daniel Firth2016-12-131-1/+1
|/
* Merge branch 'fix-prefix-collection' into 'master' locallycompact2016-12-121-6/+22
|\
| * Fix collection of prefixes to recursefix-prefix-collectionTristan Van Berkom2016-12-121-6/+22
|/
* Merge branch 'lc/multifsfix' into 'master' Javier Jardón2016-12-111-1/+1
|\
| * Strip leading slash from MultiFS search for _find_extensionsDaniel Firth2016-12-101-1/+1
|/
* Update README.md: Remove github bagde Javier Jardón2016-12-091-1/+0
* Merge branch 'lc/upgrade_fs' into 'master' Javier Jardón2016-12-092-3/+3
|\
| * Upgrade pyfilesystem to 2.0.0Daniel Firth2016-12-092-3/+3
|/
* Merge branch 'lc/python2.7-slim' into 'master' Javier Jardón2016-12-071-1/+1
|\
| * Change docker to python:2.7-slimDaniel Firth2016-12-071-1/+1
|/
* Merge branch 'jjardon/before_script' into 'master' Pedro Alvarez Piedehierro2016-12-071-8/+4
|\
| * .gitlab-ci.yml: clone definitions in the 'before_script:' stepjjardon/before_scriptJavier Jardón2016-12-061-8/+4
|/
* Merge branch 'lc/revert-py3.4' into 'master' locallycompact2016-11-2922-533/+503
|\
| * Revert "Update code to python3"lc/revert-py3.4Daniel Firth2016-11-2915-65/+74
| * Revert "Update ci to py3 with onbuild docker"Daniel Firth2016-11-292-24/+10
| * Revert "pep8"Daniel Firth2016-11-293-7/+5
| * Revert "repos.py, cache.py, utils.py: Do not import app"Daniel Firth2016-11-293-2/+3
| * Revert "Move log functions to utils.py"Daniel Firth2016-11-2912-145/+134
| * Revert "WIP: Put the config in a different file?"Daniel Firth2016-11-2913-116/+110
| * Revert "Move chdir, timer to utils; fix circular deps"Daniel Firth2016-11-2915-213/+200
| * Revert "Stop submodule error hiding, parse as unicode"Daniel Firth2016-11-291-17/+23