aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controllerbjormel2023-10-26279-1569/+2153
|\
| * Merge pull request #29113 from vespa-engine/freva/remove-billingValerij Fredriksen2023-10-262-520/+0
| |\
| | * Remove /billing/v1Valerij Fredriksen2023-10-261-517/+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-251-15/+42
| |\ \
| | * | Make bold not emphasisedBjørn Christian Seime2023-10-251-3/+3
| | * | Use markdown in trial notificationBjørn Christian Seime2023-10-251-5/+12
| | * | 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-252-6/+47
| |\ \ \ | | |/ / | |/| |
| | * | Rename TaxCode -> TaxIdOla Aunronning2023-10-242-12/+12
| | * | Wrap attributes in StringWrapperOla Aunronning2023-10-242-22/+27
| | * | Add tax code/purchase order/invoice emailOla Aunronning2023-10-242-3/+39
| * | | Assign copied listValerij Fredriksen2023-10-241-1/+1
| |/ /
| * | Merge pull request #29071 from vespa-engine/freva/console-resolverBjørn Christian Seime2023-10-246-61/+83
| |\ \
| | * | Fix testValerij Fredriksen2023-10-231-1/+1
| | * | Set title for existing notificationsValerij Fredriksen2023-10-236-61/+83
| * | | Merge pull request #29038 from vespa-engine/bill-status-enumGjøran Voldengen2023-10-233-10/+13
| |\ \ \
| | * | | Only maintain OPEN bills.gjoranv2023-10-231-2/+2
| | * | | Introduce new BillStatus enumgjoranv2023-10-202-6/+7
| | * | | Move StatusHistory to separate file.gjoranv2023-10-202-2/+4
| * | | | Merge pull request #29068 from vespa-engine/olaa/include-verification-statusGjøran Voldengen2023-10-232-4/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Include verification status in info/billing API. Empty email is not verifiedOla Aunronning2023-10-232-4/+2
| * | | | Use ConsoleUrls instead of ZoneRegistryValerij Fredriksen2023-10-238-129/+54
| |/ / /
| * | | Move PricingApiHandler and related code to internal repoHarald Musum2023-10-211-218/+0
| * | | Revert "Move PricingApiHandler and related code to internal repo"Ola Aunrønning2023-10-201-0/+218
| |/ /
| * | Merge pull request #29053 from vespa-engine/bjorncs/email-notificationValerij Fredriksen2023-10-209-97/+165
| |\ \
| | * | Move out mail templating to separate classBjørn Christian Seime2023-10-207-87/+143
| | * | Remove dead codeBjørn Christian Seime2023-10-201-1/+0
| | * | Introduce 'title' to notificationBjørn Christian Seime2023-10-205-9/+22
| * | | Merge pull request #29050 from vespa-engine/hmusum/move-pricing-api-handlerValerij Fredriksen2023-10-201-218/+0
| |\ \ \
| | * | | Move PricingApiHandler and related code to internal repoHarald Musum2023-10-201-218/+0
| | |/ /
| * | | Merge pull request #29029 from vespa-engine/olaa/line-item-aggregationØyvind Grønnesby2023-10-201-1/+4
| |\ \ \ | | |/ / | |/| |
| | * | Move bill exporting to BillingReporterOla Aunronning2023-10-191-1/+4
| | |/
| * / Billing system information for a tenantØyvind Grønnesby2023-10-191-0/+47
| |/
| * 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-191-0/+30
| |\ \
| | * | Add collection method to billing/v2Øyvind Grønnesby2023-10-181-0/+30
| * | | PricingController has move, injected as a component nowHarald Musum2023-10-191-3/+5
| |/ /
| * | Merge pull request #29013 from vespa-engine/jonmv/remove-deployment-job-sleep...Jon Marius Venstad2023-10-181-2/+2
| |\ \ | | |/ | |/|
| | * Remove extra 1-minute naps when waiting for provisioningjonmv2023-10-181-2/+2
| * | Always log last exception when BcpGroupUpdater has a failurebjormel2023-10-181-1/+1
| * | Merge pull request #28988 from vespa-engine/ogronnesby/billing-v2-gpuØyvind Grønnesby2023-10-181-1/+1
| |\ \
| | * | Output GPU details in billing/v2Øyvind Grønnesby2023-10-171-1/+1
| * | | Merge pull request #28982 from vespa-engine/mpolden/log-prepared-endpointsMorten Tokle2023-10-182-10/+6
| |\ \ \ | | |/ / | |/| |
| | * | Log prepared endpointsMartin Polden2023-10-172-10/+6