aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api/src/main/java/com/yahoo
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controllerbjormel2023-10-26340-532/+985
|\
| * Merge pull request #29113 from vespa-engine/freva/remove-billingValerij Fredriksen2023-10-263-69/+5
| |\
| | * Remove /billing/v1Valerij Fredriksen2023-10-263-69/+5
| * | Merge pull request #29077 from vespa-engine/bill-state-transitionsGjøran Voldengen2023-10-262-3/+32
| |\ \ | | |/ | |/|
| | * Support legacy bill status "CANCELED"gjoranv2023-10-261-2/+5
| | * minor: make comment more general.gjoranv2023-10-241-1/+1
| | * Add bill status logic.gjoranv2023-10-241-0/+26
| * | Merge pull request #29089 from vespa-engine/bjorncs/trial-notificationsBjørn Christian Seime2023-10-251-0/+2
| |\ \
| | * | Add billing view to `ConsoleUrls`Bjørn Christian Seime2023-10-251-0/+2
| | |/
| * | Rename TaxCode -> TaxIdOla Aunronning2023-10-242-19/+19
| * | Wrap attributes in StringWrapperOla Aunronning2023-10-244-11/+57
| * | Add tax code/purchase order/invoice emailOla Aunronning2023-10-241-7/+44
| |/
| * Merge pull request #29038 from vespa-engine/bill-status-enumGjøran Voldengen2023-10-238-42/+86
| |\
| | * Add test to verify that only OPEN bills are maintained.gjoranv2023-10-231-1/+9
| | * Rename FINALIZED -> FROZEN and improve comments.gjoranv2023-10-201-4/+4
| | * Fix conversion from legacy states, and add test.gjoranv2023-10-201-8/+6
| | * Rename and clean up unnecessary states.gjoranv2023-10-201-3/+2
| | * Introduce new BillStatus enumgjoranv2023-10-207-12/+45
| | * Move StatusHistory to separate file.gjoranv2023-10-204-35/+41
| * | Merge pull request #29068 from vespa-engine/olaa/include-verification-statusGjøran Voldengen2023-10-231-1/+1
| |\ \
| | * | Include verification status in info/billing API. Empty email is not verifiedOla Aunronning2023-10-231-1/+1
| * | | Use ConsoleUrls instead of ZoneRegistryValerij Fredriksen2023-10-232-27/+6
| * | | Create service to generate Console URLsValerij Fredriksen2023-10-232-1/+90
| |/ /
| * | Move PricingApiHandler and related code to internal repoHarald Musum2023-10-217-177/+0
| * | Revert "Move PricingApiHandler and related code to internal repo"Ola Aunrønning2023-10-207-0/+177
| |/
| * Merge pull request #29050 from vespa-engine/hmusum/move-pricing-api-handlerValerij Fredriksen2023-10-207-177/+0
| |\
| | * Move PricingApiHandler and related code to internal repoHarald Musum2023-10-207-177/+0
| * | Merge pull request #29029 from vespa-engine/olaa/line-item-aggregationØyvind Grønnesby2023-10-207-12/+53
| |\ \ | | |/ | |/|
| | * Move bill exporting to BillingReporterOla Aunronning2023-10-197-12/+53
| * | Improve logged messagejonmv2023-10-191-5/+5
| * | Time suppliers, and warn when slowjonmv2023-10-191-4/+46
| * | Clean up signaturejonmv2023-10-191-2/+2
| * | Propagate endpoint cert not ready causejonmv2023-10-191-1/+1
| |/
| * PricingController has move, injected as a component nowHarald Musum2023-10-191-3/+0
| * Allow no application resourcesValerij Fredriksen2023-10-171-22/+22
| * Revert "Revert "Set creator as contact when initiating new tenant""Bjørn Christian Seime2023-10-171-1/+6
| * Add description for enclave item for total spendHarald Musum2023-10-171-12/+20
| * Merge pull request #28949 from vespa-engine/olaa/billing-verificationOla Aunrønning2023-10-171-1/+2
| |\
| | * Billing mail verificationOla Aunronning2023-10-161-1/+2
| * | Merge pull request #28909 from vespa-engine/maintain-invoicesGjøran Voldengen2023-10-176-5/+78
| |\ \
| | * | Add test for invoice maintenance done by BillingReportMaintainer.gjoranv2023-10-164-12/+30
| | * | Add method comment.gjoranv2023-10-161-0/+1
| | * | Wire in invoice maintainancegjoranv2023-10-162-1/+7
| | * | Allow maintaining and updating invoices.gjoranv2023-10-162-0/+48
| * | | Merge remote-tracking branch 'origin/master' into ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-164-19/+12
| |\| |
| | * | Stop using name for each applicationHarald Musum2023-10-164-19/+10
| | * | Minor test cleanup and add enclave() method to ApplicationResourcesHarald Musum2023-10-141-0/+2
| | |/
| * / Add additional items to billing/v2Øyvind Grønnesby2023-10-161-1/+1
| |/
| * Remove support for legacy price calculations from APIHarald Musum2023-10-134-28/+18
| * Test pricing API with 2 appsHarald Musum2023-10-131-6/+20