Skip to content

Commit 20a2399

Browse files
jrussettameowlia
authored andcommitted
Enable merge commits in diego/garden/netwrk repos
This commit removes the restrictions on using the `Merge commit` strategy to accept PRs in the repos managed by the following working groups: - Diego - Garden Containers - Networking My understanding is that at some point someone manually disabled merge commits for (some of) our repos because they felt like it. This happened before the repo settings were managed by the TOC / the cf community repo tooling, then these settings were persisted. This config will enable merge commits so we don't have to rebase or squash every single PR.
1 parent 9d32e30 commit 20a2399

File tree

1 file changed

+0
-55
lines changed

1 file changed

+0
-55
lines changed

org/cloudfoundry.yml

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,14 @@ orgs:
6767
archived: true
6868
has_projects: true
6969
archiver:
70-
allow_merge_commit: false
7170
description: Utilities for extracting and compressing tgz and zip files.
7271
has_issues: false
7372
has_projects: true
7473
auction:
75-
allow_merge_commit: false
7674
description: Auction encodes Diego's long-running-process distribution algorithm
7775
has_issues: false
7876
has_projects: true
7977
auctioneer:
80-
allow_merge_commit: false
8178
description: Runs diego auctions
8279
has_issues: false
8380
has_projects: true
@@ -94,12 +91,10 @@ orgs:
9491
description: a concourse resource for manipulating bbl states
9592
has_projects: true
9693
bbs:
97-
allow_merge_commit: false
9894
description: Internal API to access the database for Diego.
9995
has_issues: false
10096
has_projects: true
10197
benchmarkbbs:
102-
allow_merge_commit: false
10398
description: Diego BBS Benchmark
10499
has_issues: false
105100
has_projects: true
@@ -465,12 +460,10 @@ orgs:
465460
has_projects: true
466461
private: true
467462
bytefmt:
468-
allow_merge_commit: false
469463
description: Human readable byte formatter
470464
has_issues: false
471465
has_projects: true
472466
cacheddownloader:
473-
allow_merge_commit: false
474467
description: A cached HTTP blob downloader
475468
has_issues: false
476469
has_projects: true
@@ -535,7 +528,6 @@ orgs:
535528
default_branch: main
536529
has_projects: true
537530
certsplitter:
538-
allow_merge_commit: false
539531
has_issues: false
540532
has_projects: true
541533
cf-acceptance-tests:
@@ -644,7 +636,6 @@ orgs:
644636
has_wiki: false
645637
private: true
646638
cf-networking-helpers:
647-
allow_merge_commit: false
648639
default_branch: main
649640
description: Shared libraries for the CF Networking team
650641
has_projects: false
@@ -655,7 +646,6 @@ orgs:
655646
area of CF
656647
has_projects: true
657648
cf-networking-release:
658-
allow_merge_commit: false
659649
default_branch: develop
660650
description: Container Networking for CloudFoundry
661651
has_projects: true
@@ -678,7 +668,6 @@ orgs:
678668
default_branch: main
679669
has_projects: true
680670
cf-routing-test-helpers:
681-
allow_merge_commit: false
682671
default_branch: main
683672
has_projects: true
684673
cf-slackin:
@@ -693,7 +682,6 @@ orgs:
693682
default_branch: main
694683
has_projects: true
695684
cf-tcp-router:
696-
allow_merge_commit: false
697685
default_branch: main
698686
description: TCP Router repository for Cloud Foundry
699687
has_projects: true
@@ -762,7 +750,6 @@ orgs:
762750
cfcd-prep:
763751
has_projects: true
764752
cfdot:
765-
allow_merge_commit: false
766753
description: A command-line tool to interact with a Cloud Foundry Diego deployment.
767754
has_issues: false
768755
has_projects: true
@@ -779,7 +766,6 @@ orgs:
779766
has_projects: true
780767
private: true
781768
cfhttp:
782-
allow_merge_commit: false
783769
description: Wrapper for official go http package
784770
has_issues: false
785771
has_projects: true
@@ -843,7 +829,6 @@ orgs:
843829
has_projects: true
844830
has_wiki: false
845831
clock:
846-
allow_merge_commit: false
847832
default_branch: main
848833
description: time provider & rich fake for Go
849834
has_issues: false
@@ -898,7 +883,6 @@ orgs:
898883
default_branch: main
899884
has_projects: true
900885
consuladapter:
901-
allow_merge_commit: false
902886
description: Consul client adapter and test cluster runner
903887
has_issues: false
904888
has_projects: true
@@ -961,7 +945,6 @@ orgs:
961945
archived: true
962946
has_projects: true
963947
debugserver:
964-
allow_merge_commit: false
965948
has_issues: false
966949
has_projects: true
967950
delayed_job_sequel:
@@ -1011,7 +994,6 @@ orgs:
1011994
has_projects: true
1012995
private: true
1013996
diego-acceptance:
1014-
allow_merge_commit: false
1015997
description: Diego PM acceptance notes and tools
1016998
has_projects: true
1017999
private: true
@@ -1026,37 +1008,31 @@ orgs:
10261008
description: Diego Architectural Design Musings and Explications
10271009
has_projects: true
10281010
diego-dockerfiles:
1029-
allow_merge_commit: false
10301011
has_issues: false
10311012
has_projects: false
10321013
has_wiki: false
10331014
diego-logging-client:
1034-
allow_merge_commit: false
10351015
has_issues: false
10361016
has_projects: true
10371017
diego-notes:
1038-
allow_merge_commit: false
10391018
description: Diego Notes
10401019
has_projects: true
10411020
diego-perf-release:
10421021
description: Used to deploy multiple app-pushers and fezzik-runners for performance-testing
10431022
a Diego(+Runtime) deployment
10441023
has_projects: true
10451024
diego-release:
1046-
allow_merge_commit: false
10471025
default_branch: develop
10481026
description: BOSH Release for Diego
10491027
has_projects: true
10501028
diego-ssh:
1051-
allow_merge_commit: false
10521029
description: Access Diego containers with ssh
10531030
has_issues: false
10541031
has_projects: true
10551032
diego-stress-tests:
10561033
description: Diego Stress Tests
10571034
has_projects: true
10581035
diego-team:
1059-
allow_merge_commit: false
10601036
description: Checklists for the Diego team
10611037
has_projects: true
10621038
private: true
@@ -1083,11 +1059,9 @@ orgs:
10831059
docker_driver_integration_tests:
10841060
has_projects: true
10851061
dockerapplifecycle:
1086-
allow_merge_commit: false
10871062
description: Code that runs inside of containers, for docker-based apps
10881063
has_projects: true
10891064
dockerdriver:
1090-
allow_merge_commit: false
10911065
has_issues: false
10921066
has_projects: true
10931067
docs-bbr:
@@ -1171,11 +1145,9 @@ orgs:
11711145
has_projects: true
11721146
private: true
11731147
durationjson:
1174-
allow_merge_commit: false
11751148
has_issues: false
11761149
has_projects: true
11771150
ecrhelper:
1178-
allow_merge_commit: false
11791151
has_issues: false
11801152
has_projects: true
11811153
eirini:
@@ -1218,13 +1190,11 @@ orgs:
12181190
has_projects: true
12191191
archived: true
12201192
eventhub:
1221-
allow_merge_commit: false
12221193
has_issues: false
12231194
has_projects: true
12241195
example-sidecar-buildpack:
12251196
has_projects: true
12261197
executor:
1227-
allow_merge_commit: false
12281198
description: thy will be done
12291199
has_issues: false
12301200
has_projects: true
@@ -1238,7 +1208,6 @@ orgs:
12381208
filelock:
12391209
has_projects: true
12401210
fileserver:
1241-
allow_merge_commit: false
12421211
description: 'Bob Loblaw''s file server '
12431212
has_issues: false
12441213
has_projects: true
@@ -1379,7 +1348,6 @@ orgs:
13791348
archived: true
13801349
has_projects: true
13811350
gorouter:
1382-
allow_merge_commit: false
13831351
default_branch: main
13841352
description: CF Router
13851353
has_projects: true
@@ -1421,7 +1389,6 @@ orgs:
14211389
description: A BOSH release for haproxy (based on cf-release's haproxy job)
14221390
has_projects: true
14231391
healthcheck:
1424-
allow_merge_commit: false
14251392
description: Common healthcheck for buildpacks and docker
14261393
has_issues: false
14271394
has_projects: true
@@ -1470,7 +1437,6 @@ orgs:
14701437
has_wiki: false
14711438
private: true
14721439
inigo:
1473-
allow_merge_commit: false
14741440
description: diego integration tests
14751441
has_issues: false
14761442
has_projects: true
@@ -1576,7 +1542,6 @@ orgs:
15761542
default_branch: main
15771543
has_projects: false
15781544
lager:
1579-
allow_merge_commit: false
15801545
description: An opinionated logger for Go.
15811546
has_projects: true
15821547
lamb-ci-tools:
@@ -1609,15 +1574,12 @@ orgs:
16091574
archived: true
16101575
has_projects: true
16111576
localdriver:
1612-
allow_merge_commit: false
16131577
has_issues: false
16141578
has_projects: true
16151579
localip:
1616-
allow_merge_commit: false
16171580
has_issues: false
16181581
has_projects: true
16191582
locket:
1620-
allow_merge_commit: false
16211583
has_issues: false
16221584
has_projects: true
16231585
log-cache:
@@ -1775,13 +1737,11 @@ orgs:
17751737
mysql-monitoring-release:
17761738
has_projects: true
17771739
nats-release:
1778-
allow_merge_commit: false
17791740
default_branch: develop
17801741
has_projects: true
17811742
netplugin-shim:
17821743
has_projects: true
17831744
networking-oss-deployments:
1784-
allow_merge_commit: false
17851745
default_branch: main
17861746
description: bbl state store for networking oss deployments
17871747
has_projects: true
@@ -1852,7 +1812,6 @@ orgs:
18521812
archived: true
18531813
has_projects: true
18541814
operationq:
1855-
allow_merge_commit: false
18561815
description: processes multiple queues in parallel
18571816
has_issues: false
18581817
has_projects: true
@@ -1988,7 +1947,6 @@ orgs:
19881947
has_projects: true
19891948
private: true
19901949
rep:
1991-
allow_merge_commit: false
19921950
description: Representative bids on tasks and schedules them on an associated
19931951
Executor
19941952
has_issues: false
@@ -2000,28 +1958,23 @@ orgs:
20001958
has_projects: true
20011959
archived: true
20021960
route-emitter:
2003-
allow_merge_commit: false
20041961
description: Registers and unregisters processes running on executors with
20051962
the gorouter
20061963
has_issues: false
20071964
has_projects: true
20081965
route-registrar:
2009-
allow_merge_commit: false
20101966
default_branch: main
20111967
description: A standalone executable written in golang that continuously broadcasts
20121968
a route using NATS to the CF router.
20131969
has_projects: true
20141970
routing-acceptance-tests:
2015-
allow_merge_commit: false
20161971
default_branch: main
20171972
has_projects: true
20181973
routing-api:
2019-
allow_merge_commit: false
20201974
default_branch: main
20211975
has_projects: false
20221976
has_wiki: false
20231977
routing-api-cli:
2024-
allow_merge_commit: false
20251978
default_branch: main
20261979
has_projects: true
20271980
routing-ci:
@@ -2035,18 +1988,15 @@ orgs:
20351988
has_projects: true
20361989
private: true
20371990
routing-info:
2038-
allow_merge_commit: false
20391991
default_branch: main
20401992
description: Routing information helpers for CF / Diego
20411993
has_projects: true
20421994
routing-perf-release:
2043-
allow_merge_commit: false
20441995
default_branch: main
20451996
description: A BOSH release for routing performance tests
20461997
has_projects: false
20471998
has_wiki: false
20481999
routing-release:
2049-
allow_merge_commit: false
20502000
default_branch: develop
20512001
description: This is the BOSH release for cloud foundry routers
20522002
has_projects: true
@@ -2172,7 +2122,6 @@ orgs:
21722122
for Cloud Foundry.
21732123
has_projects: true
21742124
silk-release:
2175-
allow_merge_commit: false
21762125
default_branch: develop
21772126
description: Silk - CNI plugin BOSH release for Cloud Foundry
21782127
has_projects: true
@@ -2319,7 +2268,6 @@ orgs:
23192268
test-log-emitter-release:
23202269
has_projects: true
23212270
tlsconfig:
2322-
allow_merge_commit: false
23232271
description: build tls configurations
23242272
has_projects: false
23252273
has_wiki: false
@@ -2396,12 +2344,10 @@ orgs:
23962344
has_projects: true
23972345
has_wiki: false
23982346
vizzini:
2399-
allow_merge_commit: false
24002347
description: 'Vizzini: Inconceivable Tests'
24012348
has_issues: false
24022349
has_projects: true
24032350
volman:
2404-
allow_merge_commit: false
24052351
has_issues: false
24062352
has_projects: true
24072353
volume-mount-options:
@@ -2448,7 +2394,6 @@ orgs:
24482394
default_branch: develop
24492395
has_projects: true
24502396
workpool:
2451-
allow_merge_commit: false
24522397
has_issues: false
24532398
has_projects: true
24542399
yagnats:

0 commit comments

Comments
 (0)