aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controllerbjormel2023-10-26467-2724/+7284
|\
| * Merge pull request #29113 from vespa-engine/freva/remove-billingValerij Fredriksen2023-10-269-892/+37
| |\
| | * More cleanupValerij Fredriksen2023-10-266-136/+37
| | * Remove /billing/v1Valerij Fredriksen2023-10-262-753/+0
| | * Remove unused routeValerij Fredriksen2023-10-261-3/+0
| * | Handle total qps 0bjormel2023-10-261-1/+3
| |/
| * Merge pull request #29028 from vespa-engine/bjormel/log_patch_data_as_finerBjørn Meland2023-10-251-0/+18
| |\
| | * Log patch data as finerbjormel2023-10-191-0/+18
| * | Skip notification emails if no-one subscribingBjørn Christian Seime2023-10-251-4/+7
| * | Merge pull request #29089 from vespa-engine/bjorncs/trial-notificationsBjørn Christian Seime2023-10-252-20/+52
| |\ \
| | * | Make bold not emphasisedBjørn Christian Seime2023-10-252-6/+6
| | * | Use markdown in trial notificationBjørn Christian Seime2023-10-252-10/+22
| | * | Move notification queuing to separate methodsBjørn Christian Seime2023-10-251-15/+35
| * | | Merge pull request #29076 from vespa-engine/olaa/more-billing-fieldsGjøran Voldengen2023-10-254-23/+205
| |\ \ \ | | |/ / | |/| |
| | * | Rename TaxCode -> TaxIdOla Aunronning2023-10-244-19/+19
| | * | Wrap attributes in StringWrapperOla Aunronning2023-10-243-25/+32
| | * | Add tax code/purchase order/invoice emailOla Aunronning2023-10-244-20/+195
| * | | Assign copied listValerij Fredriksen2023-10-241-1/+1
| |/ /
| * | Merge pull request #29071 from vespa-engine/freva/console-resolverBjørn Christian Seime2023-10-2411-90/+151
| |\ \
| | * | Fix testValerij Fredriksen2023-10-231-1/+1
| | * | Set title for existing notificationsValerij Fredriksen2023-10-2311-90/+151
| * | | Merge pull request #29038 from vespa-engine/bill-status-enumGjøran Voldengen2023-10-235-18/+35
| |\ \ \
| | * | | Add test to verify that only OPEN bills are maintained.gjoranv2023-10-231-3/+17
| | * | | Only maintain OPEN bills.gjoranv2023-10-231-2/+2
| | * | | Introduce new BillStatus enumgjoranv2023-10-203-9/+11
| | * | | Move StatusHistory to separate file.gjoranv2023-10-203-5/+6
| * | | | Merge pull request #29068 from vespa-engine/olaa/include-verification-statusGjøran Voldengen2023-10-234-11/+9
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Include verification status in info/billing API. Empty email is not verifiedOla Aunronning2023-10-234-11/+9
| * | | | Use ConsoleUrls instead of ZoneRegistryValerij Fredriksen2023-10-2320-204/+97
| * | | | Create service to generate Console URLsValerij Fredriksen2023-10-231-0/+8
| |/ / /
| * | | Move PricingApiHandler and related code to internal repoHarald Musum2023-10-213-407/+0
| * | | Revert "Move PricingApiHandler and related code to internal repo"Ola Aunrønning2023-10-203-0/+407
| |/ /
| * | Merge pull request #29053 from vespa-engine/bjorncs/email-notificationValerij Fredriksen2023-10-2015-110/+181
| |\ \
| | * | Move out mail templating to separate classBjørn Christian Seime2023-10-2010-97/+151
| | * | Remove dead codeBjørn Christian Seime2023-10-201-1/+0
| | * | Introduce 'title' to notificationBjørn Christian Seime2023-10-209-12/+30
| * | | Merge pull request #29050 from vespa-engine/hmusum/move-pricing-api-handlerValerij Fredriksen2023-10-203-407/+0
| |\ \ \
| | * | | Move PricingApiHandler and related code to internal repoHarald Musum2023-10-203-407/+0
| | |/ /
| * | | Merge pull request #29029 from vespa-engine/olaa/line-item-aggregationØyvind Grønnesby2023-10-203-3/+6
| |\ \ \ | | |/ / | |/| |
| | * | Move bill exporting to BillingReporterOla Aunronning2023-10-193-3/+6
| | |/
| * | Merge pull request #29035 from vespa-engine/ogronnesby/billing-v2-accountant-...Gjøran Voldengen2023-10-192-0/+55
| |\ \
| | * | Billing system information for a tenantØyvind Grønnesby2023-10-192-0/+55
| | |/
| * / Clean up signaturejonmv2023-10-191-2/+1
| |/
| * Merge pull request #29011 from vespa-engine/jonmv/tenant-host-redeployerHåkon Hallingstad2023-10-192-9/+56
| |\
| | * Use BFS rather than DFS task order for in-thread test executorjonmv2023-10-192-9/+56
| * | Merge pull request #29017 from vespa-engine/ogronnesby/billing-reporter-publicOla Aunrønning2023-10-191-1/+1
| |\ \
| | * | Enable billing reporter in publicØyvind Grønnesby2023-10-181-1/+1
| * | | Merge pull request #29018 from vespa-engine/ogronnesby/billing-v2-collectionØyvind Grønnesby2023-10-192-0/+56
| |\ \ \
| | * | | Add collection method to billing/v2Øyvind Grønnesby2023-10-182-0/+56
| | | |/ | | |/|
| * | | Remove mock pricing controller from service registry mockHarald Musum2023-10-191-6/+0