summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lc/recursive_submodules_backport' into lc/staging/futurelc/staging/futureDaniel Firth2016-12-021-161/+125
|\
| * Recursive submodule fixlc/recursive_submodules_backportDaniel Firth2016-11-301-161/+125
* | Merge branch 'lc/rework_splitting' into lc/staging/futureDaniel Firth2016-12-022-232/+71
|\ \
| * | WIP: Splitting rework, just print plain metafiles to chunks and strata, turn ...Daniel Firth2016-12-022-232/+71
* | | Merge branch 'lc/python2.7-slim' into lc/staging/futureDaniel Firth2016-12-021-1/+1
|\ \ \
| * | | Change docker to python:2.7-slimDaniel Firth2016-11-301-1/+1
| | |/ | |/|
* | | Merge branch 'lc/splitting_cleanup' into lc/staging/futureDaniel Firth2016-12-021-27/+34
|\ \ \ | | |/ | |/|
| * | Small splitting cleanup, use OSFS, better return type on compile_rulesDaniel Firth2016-12-021-27/+34
| |/
* | Stop returning string or False, None is fineDaniel Firth2016-12-021-7/+1
|/
* 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
| * Revert "Try with 3.4-onbuild"Daniel Firth2016-11-291-1/+1
| * Revert "Stop hiding exceptions"Daniel Firth2016-11-292-5/+4
| * Revert "Change shebang to '#!/usr/bin/python3'"Daniel Firth2016-11-297-9/+9
| * Revert "install_dependencies.sh: Use 'python3 get-pip.py'"Daniel Firth2016-11-291-1/+2
|/
* Merge branch 'lc/py3.4' into 'master' devcurmudgeon2016-11-2822-503/+533
|\
| * install_dependencies.sh: Use 'python3 get-pip.py'lc/py3.4Javier Jardón2016-11-161-2/+1
| * Change shebang to '#!/usr/bin/python3'Javier Jardón2016-11-167-9/+9
| * Stop hiding exceptionsDaniel Firth2016-11-162-4/+5
| * Try with 3.4-onbuildDaniel Firth2016-11-161-1/+1
| * Stop submodule error hiding, parse as unicodeDaniel Firth2016-11-161-23/+17
| * Move chdir, timer to utils; fix circular depsDaniel Firth2016-11-1615-200/+213
| * WIP: Put the config in a different file?Javier Jardón2016-11-1513-110/+116
| * Move log functions to utils.pyJavier Jardón2016-11-1512-134/+145
| * repos.py, cache.py, utils.py: Do not import appJavier Jardón2016-11-153-3/+2
| * pep8Daniel Firth2016-11-153-5/+7
| * Update ci to py3 with onbuild dockerDaniel Firth2016-11-152-10/+24
| * Update code to python3Daniel Firth2016-11-1515-74/+65
|/
* Merge branch 'jjardon/tacgomes/artifact-splitting' into 'master' Ana2016-11-151-25/+17
|\
| * Include all artifacts if not explicitly givenTiago Gomes2016-11-151-25/+17
|/
* Merge branch 'lc/peg' into 'master' devcurmudgeon2016-11-043-19/+17
|\
| * peg requirements at exact versionslc/pegDaniel Firth2016-11-033-19/+17
|/
* Merge branch 'ps/ci-tweaks' into 'master' devcurmudgeon2016-10-302-4/+33
|\
| * Add check for cache_keys_v6 to gitlab-ciPaul Sherwood2016-10-301-1/+15
| * Check each pip installPaul Sherwood2016-10-301-3/+18
|/
* Revert "Trap error on any of the pip install commands"Paul Sherwood2016-10-291-19/+3
* Trap error on any of the pip install commandsPaul Sherwood2016-10-291-3/+19
* Remove Dependencies.md - see install_dependencies.shPaul Sherwood2016-10-291-35/+0
* Merge branch 'jjardon/no-kbas' into 'master' Daniel Firth2016-10-281-0/+9
|\
| * .gitlab-ci.yml: Add a job to always build the build-essential stratum, not us...Javier Jardón2016-10-271-0/+9
|/
* Revert "Patch for bubblewrap backend"Paul Sherwood2016-10-262-6/+2
* Merge branch 'leeming/bwrap-dev-patch' into 'master' devcurmudgeon2016-10-262-2/+6
|\
| * Patch for bubblewrap backendleeming/bwrap-dev-patchAndrew Leeming2016-10-262-2/+6
|/