summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2020-06-24 06:47:06 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-06-24 06:47:06 +0000
commit88f280d541e2f7c7b8655bab65bb1eb682872a16 (patch)
treeaeb0a23c5ee8cec0c1ffcf61da1f83453fa63601 /setup.py
parente4e3b4568e6f7e1575fdd90ec2c688ceee97322e (diff)
parent3d5d655e40470a805999834560605d6e54bd7d72 (diff)
downloadbuildstream-88f280d541e2f7c7b8655bab65bb1eb682872a16.tar.gz
Merge branch 'tristan/junction-jungle' into 'master'
Explicit control of junction configuration overrides Closes #1326 See merge request BuildStream/buildstream!1901
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions