summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | Merge pull request #28978 from vespa-engine/ogronnesby/billing-v2-planØyvind Grønnesby2023-10-171-0/+37
|\ \ \
| * | | Update plan for billing/v2Øyvind Grønnesby2023-10-171-0/+37
* | | | Allow no application resourcesValerij Fredriksen2023-10-171-32/+1
|/ / /
* | | Eagerly serialize to stringBjørn Christian Seime2023-10-171-1/+1
* | | Merge pull request #28963 from vespa-engine/bjorncs/notificationBjørn Christian Seime2023-10-171-0/+2
|\ \ \
| * | | Specify all required template parametersBjørn Christian Seime2023-10-171-0/+2
| |/ /
* | | Merge pull request #28952 from vespa-engine/bjorncs/email-notificationBjørn Christian Seime2023-10-173-7/+68
|\ \ \
| * | | Include email content when persisting notificationBjørn Christian Seime2023-10-163-7/+68
* | | | Merge pull request #28965 from vespa-engine/olaa/mailtype-argumentOla Aunrønning2023-10-172-7/+4
|\ \ \ \
| * | | | Address Javadoc warningOla Aunronning2023-10-171-1/+0
| * | | | Remove unnecessary argumentOla Aunronning2023-10-171-6/+4
| | |/ / | |/| |
* / | | Add description for enclave item for total spendHarald Musum2023-10-171-1/+1
|/ / /
* | | Merge pull request #28949 from vespa-engine/olaa/billing-verificationOla Aunrønning2023-10-173-14/+28
|\ \ \
| * | | Billing mail verificationOla Aunronning2023-10-163-14/+28
* | | | Merge pull request #28909 from vespa-engine/maintain-invoicesGjøran Voldengen2023-10-171-3/+27
|\ \ \ \
| * | | | Add test for invoice maintenance done by BillingReportMaintainer.gjoranv2023-10-161-3/+4
| * | | | Wire in invoice maintainancegjoranv2023-10-161-3/+26
* | | | | Fix NPEBjørn Christian Seime2023-10-171-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #28931 from vespa-engine/ogronnesby/billing-account-valueØyvind Grønnesby2023-10-172-2/+2
|\ \ \ \
| * | | | Use .value() to represent enclave account in APIØyvind Grønnesby2023-10-152-2/+2
* | | | | Merge pull request #28932 from vespa-engine/ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-171-0/+60
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'origin/master' into ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-162-34/+15
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add additional items to billing/v2Øyvind Grønnesby2023-10-161-0/+60
| | |_|/ | |/| |
* | | | Merge pull request #28938 from vespa-engine/bjorncs/email-notificationØyvind Grønnesby2023-10-168-6/+189
|\ \ \ \ | |_|/ / |/| | |