summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bschubert/fix-silence-stopiteration-pep-0479' into 'master'richardmaw-codethink2018-11-121-20/+22
|\
| * source.py: don't let StopIteration propagate to silence() contextmanagerbschubert/fix-silence-stopiteration-pep-0479Benjamin Schubert2018-11-091-20/+22
|/
* Merge branch 'jmac/cas_to_cas_v2' into 'master'Jim MacArthur2018-11-092-94/+652
|\
| * virtual_directory_import.py: New testjmac/cas_to_cas_v2Jim MacArthur2018-11-091-0/+271
| * _casbaseddirectory: Fix order of list_modified_pathsJim MacArthur2018-11-091-9/+26
| * _casbaseddirectory.py: Enable direct CAS-to-CAS import.Jim MacArthur2018-11-091-85/+355
|/
* Merge branch 'danielsilverstone-ct/plugin-destroy-debug-to-stderr' into 'master'Valentin David2018-11-091-1/+2
|\
| * plugin.py: Redirect DEBUG from `__del__` to `sys.stderr`danielsilverstone-ct/plugin-destroy-debug-to-stderrDaniel Silverstone2018-11-091-1/+2
|/
* Merge branch 'jennis/quota_declaration_fix' into 'master'Javier Jardón2018-11-083-7/+53
|\
| * artifactcache.py: Fix misleading error message when using % cache quotajennis/quota_declaration_fixJames Ennis2018-11-082-7/+15
| * using_config.rst: Add documentation to showing how to impose quotas on the lo...James Ennis2018-11-081-0/+38
|/
* Merge branch 'aevri/contributing_gitlab' into 'master'Angelos Evripiotis2018-11-081-1/+23
|\
| * contributing: emphasise the 'why' in commitsAngelos Evripiotis2018-11-081-0/+10
| * contributing: non-WIP should always be landableAngelos Evripiotis2018-11-081-0/+6
| * contributing: WIP again to be kind to reviewersAngelos Evripiotis2018-11-081-1/+7
|/
* Merge branch 'valentindavid/fix-script-install-root' into 'master'Valentin David2018-11-086-2/+88
|\
| * Fix bug with root mounted as non-artifact in script plugin.Valentin David2018-11-086-2/+88
|/
* Merge branch 'bschubert/tests-no-chroot-linux' into 'master'Benjamin Schubert2018-11-088-49/+134
|\
| * Test that helpful messages are raised when missing dependenciesBenjamin Schubert2018-11-085-1/+97
| * conftest.py: Ensure platform is not maintained between testsBenjamin Schubert2018-11-081-0/+7
| * Move bwrap checks in platform/linux.pyBenjamin Schubert2018-11-082-48/+30
|/
* Merge branch 'valentindavid/fix-recursive-strip-debug' into 'master'Valentin David2018-11-084-3/+8
|\
| * Fix infinite recursion in default strip debug commandValentin David2018-11-084-3/+8
|/
* Merge branch 'valentindavid/script-artifact-corruption' into 'master'richardmaw-codethink2018-11-076-7/+70
|\
| * Fix cache corruption by scripts when layout and integration commands are usedValentin David2018-11-076-7/+70
|/
* Merge branch 'jmac/make_writable_combination' into 'master'Jim MacArthur2018-11-071-10/+3
|\
| * element.py: Use _force_rmtree instead of custom code.jmac/make_writable_combinationJim MacArthur2018-11-071-10/+3
|/
* Merge branch 'jennis/docs_patch' into 'master'richardmaw-codethink2018-11-073-67/+81
|\
| * using_configuring_artifact_server.rst: Remove examples and redirect to user c...James Ennis2018-11-071-47/+7
| * format_project.rst: Update instructions regarding how we declare remote cache...James Ennis2018-11-071-5/+20
| * using_config.rst: Update our instructions for how we declare caches in user c...James Ennis2018-11-072-15/+54
|/
* Merge branch 'jmac/remote-sandbox-errors' into 'master'Jim MacArthur2018-11-061-4/+1
|\
| * _sandboxremote.py: Use the standard SandboxError.jmac/remote-sandbox-errorsJim MacArthur2018-11-061-4/+1
|/
* Merge branch 'Qinusty/unit-test-utils' into 'master'richardmaw-codethink2018-11-063-3/+78
|\
| * Add regression test for _pretty_sizeJosh Smith2018-11-062-0/+74
| * utils: Fix _pretty_size() for sizes > 1024TJosh Smith2018-11-061-3/+4
|/
* Merge branch 'juerg/cas' into 'master'Jürg Billeter2018-11-0514-429/+572
|\
| * Split up artifact cache and CAS cacheJürg Billeter2018-11-059-403/+550
| * element.py: Do not include type name of artifact cache in cache keyJürg Billeter2018-11-051-1/+1
| * _project.py: Remove unused artifacts parameter from load_elements()Jürg Billeter2018-11-054-9/+8
| * element.py: Remove unused artifacts parameter from _new_from_meta()Jürg Billeter2018-11-053-6/+5
| * _project.py: Remove unused artifacts parameter from create_element()Jürg Billeter2018-11-052-3/+2
| * _elementfactory.py: Remove unused artifacts parameter from create()Jürg Billeter2018-11-052-4/+3
| * element.py: Remove artifacts parameter from constructorJürg Billeter2018-11-052-3/+3
|/
* Merge branch 'richardmaw/pytest-dep-update' into 'master'richardmaw-codethink2018-11-051-1/+1
|\
| * dev-requirements: Update pytest dependency to 3.8Richard Maw2018-11-051-1/+1
|/
* Merge branch 'valentindavid/limit_fetchers_in_overnight_build' into 'master'Javier Jardón2018-11-051-0/+6
|\
| * Use less fetchers in overnight build to work-around limitations from servers.Valentin David2018-11-051-0/+6
|/
* Merge branch 'juerg/remote-execution' into 'master'Jürg Billeter2018-11-051-0/+1
|\
| * element.py: Pass bare_directory also to SandboxRemote()juerg/remote-executionJürg Billeter2018-11-031-0/+1
|/