summaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java
Commit message (Expand)AuthorAgeFilesLines
* Revert "Move PricingApiHandler and related code to internal repo"Ola Aunrønning2023-10-202-0/+189
* Merge pull request #29053 from vespa-engine/bjorncs/email-notificationValerij Fredriksen2023-10-205-9/+12
|\
| * Move out mail templating to separate classBjørn Christian Seime2023-10-202-6/+4
| * Introduce 'title' to notificationBjørn Christian Seime2023-10-204-3/+8
* | Merge pull request #29050 from vespa-engine/hmusum/move-pricing-api-handlerValerij Fredriksen2023-10-202-189/+0
|\ \
| * | Move PricingApiHandler and related code to internal repoHarald Musum2023-10-202-189/+0
| |/
* | Merge pull request #29029 from vespa-engine/olaa/line-item-aggregationØyvind Grønnesby2023-10-202-2/+2
|\ \ | |/ |/|
| * Move bill exporting to BillingReporterOla Aunronning2023-10-192-2/+2
* | Merge pull request #29035 from vespa-engine/ogronnesby/billing-v2-accountant-...Gjøran Voldengen2023-10-191-0/+8
|\ \
| * | Billing system information for a tenantØyvind Grønnesby2023-10-191-0/+8
| |/
* / 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 #29018 from vespa-engine/ogronnesby/billing-v2-collectionØyvind Grønnesby2023-10-191-0/+26
|\ \
| * | Add collection method to billing/v2Øyvind Grønnesby2023-10-181-0/+26
| |/
* / Remove mock pricing controller from service registry mockHarald Musum2023-10-191-6/+0
|/
* Output GPU details in billing/v2Øyvind Grønnesby2023-10-171-2/+2
* Merge pull request #28978 from vespa-engine/ogronnesby/billing-v2-planØyvind Grønnesby2023-10-171-0/+26
|\
| * Update plan for billing/v2Øyvind Grønnesby2023-10-171-0/+26
* | Allow no application resourcesValerij Fredriksen2023-10-171-7/+8
|/
* Merge pull request #28963 from vespa-engine/bjorncs/notificationBjørn Christian Seime2023-10-171-1/+29
|\
| * Verify email content in unit testBjørn Christian Seime2023-10-171-1/+29
| * Merge pull request #28961 from vespa-engine/bjorncs/notificationBjørn Christian Seime2023-10-173-8/+16
| |\
| | * Set creator as contact when initiating new tenantBjørn Christian Seime2023-10-173-8/+16
* | | Merge pull request #28952 from vespa-engine/bjorncs/email-notificationBjørn Christian Seime2023-10-171-2/+9
|\ \ \
| * | | Include email content when persisting notificationBjørn Christian Seime2023-10-161-2/+9
* | | | Revert "Revert "Set creator as contact when initiating new tenant""Bjørn Christian Seime2023-10-173-8/+16
* | | | Add description for enclave item for total spendHarald Musum2023-10-171-31/+33
| |/ / |/| |
* | | Merge pull request #28949 from vespa-engine/olaa/billing-verificationOla Aunrønning2023-10-173-3/+31
|\ \ \ | |_|/ |/| |
| * | Billing mail verificationOla Aunronning2023-10-163-3/+31
* | | Merge pull request #28909 from vespa-engine/maintain-invoicesGjøran Voldengen2023-10-172-3/+32
|\ \ \
| * | | Non-functional: imports and whitespacegjoranv2023-10-161-5/+0
| * | | Remove unused method.gjoranv2023-10-161-14/+0
| * | | Add test for invoice maintenance done by BillingReportMaintainer.gjoranv2023-10-162-3/+51
* | | | Merge pull request #28932 from vespa-engine/ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-173-6/+43
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'origin/master' into ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-164-151/+137
| |\| |
| * | | Add additional items to billing/v2Øyvind Grønnesby2023-10-163-6/+43
| | |/ | |/|
* | | Merge pull request #28938 from vespa-engine/bjorncs/email-notificationØyvind Grønnesby2023-10-161-0/+38
|\ \ \ | |_|/ |/| |
| * | Test that trial notifications are triggeredBjørn Christian Seime2023-10-161-0/+38
| |/
* | Merge pull request #28944 from vespa-engine/hmusum/stop-using-name-per-applic...Harald Musum2023-10-161-9/+4
|\ \
| * | Stop using name for each applicationHarald Musum2023-10-161-9/+4
* | | Merge pull request #28940 from vespa-engine/mpolden/read-endpoint-config-flagMartin Polden2023-10-163-33/+34
|\ \ \ | |/ / |/| |
| * | Enable testMartin Polden2023-10-161-20/+21
| * | Read endpoint-config flagMartin Polden2023-10-163-13/+13
| |/
* / Minor test cleanup and add enclave() method to ApplicationResourcesHarald Musum2023-10-141-114/+104
|/
* Show cloud account used in each runjonmv2023-10-131-0/+9
* Remove support for legacy price calculations from APIHarald Musum2023-10-131-52/+2
* Test pricing API with 2 appsHarald Musum2023-10-131-2/+47
* Support calculating and presenting prices per applications and in totalHarald Musum2023-10-131-29/+50
* Remove "discount" from enclave price item, can be positiveHarald Musum2023-10-121-3/+3