zuul/zuul
Joshua Watt 968c2ffd1f merger: Handle merges with cherry-pick merge-mode
Merges cannot be cherry-picked in git, so if a change is a merge, do a
`git merge` instead of a cherry-pick to match how Gerrit will merge the
change.

Change-Id: I9bc7025d2371913b63f0a6723aff480e7e63d8a3
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
2022-05-11 10:06:18 -05:00
..
ansible Merge "zuul_json: remove no_log handling" 2022-05-03 05:37:49 +00:00
cmd Make a global component registry 2022-02-14 10:58:34 -08:00
connection Clear branch cache on full reconfiguration 2022-03-14 13:09:38 -07:00
driver Merge "gerritdriver: enable triggering on wip state" 2022-04-29 00:05:15 +00:00
execution_context Add wrapper driver execution context 2017-08-18 16:35:12 -07:00
executor Merge "Make nodepool hostvars available on unreachable hosts" 2022-04-28 23:55:38 +00:00
lib Add netaddr to Ansible venvs 2022-04-30 23:36:44 +00:00
manager Merge "Fix updating change when emulating gerrit topic support" 2022-05-11 05:28:38 +00:00
merger merger: Handle merges with cherry-pick merge-mode 2022-05-11 10:06:18 -05:00
reporter Merge "Dequeue items that can no longer merge" 2022-03-23 01:00:06 +00:00
source Add queue.dependencies-by-topic 2022-03-25 15:25:52 -07:00
sphinx docs: remove zuuldocs domain 2020-08-04 16:10:09 +10:00
trigger Filter events on event connection 2021-04-24 08:39:03 -07:00
vendor Add some pipeline processing stats 2022-01-25 08:16:52 -08:00
web Fix background layout updates in zuul-web 2022-04-13 16:09:36 -07:00
zk Merge "Ignore deleted nodes when looking for lost params" 2022-04-29 00:04:38 +00:00
__init__.py Initial commit. 2012-05-29 14:49:32 -07:00
_setup_hook.py Revert "Revert "Create zuul/web/static on demand"" 2020-07-07 19:53:33 +02:00
change_matcher.py Fix reporting certain config syntax errors 2022-04-26 11:02:17 -07:00
configloader.py Merge "Add support for Ansible 5" 2022-04-28 09:01:09 +00:00
exceptions.py Let zuul-web look up the live log streaming address from ZooKeeper 2021-09-22 07:25:13 +02:00
model.py Merge "Fix a bug that re-enqueue may skip soft dependent jobs" 2022-04-29 00:01:33 +00:00
model_api.py Add a blob store and store large secrets in it 2022-04-08 17:12:08 -07:00
nodepool.py Report gross/total tenant resource usage stats 2022-03-17 14:51:18 +01:00
scheduler.py Merge "Add a blob store and store large secrets in it" 2022-04-12 01:51:33 +00:00
version.py Store version information in component registry 2021-10-20 17:17:02 +02:00