summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #28978 from vespa-engine/ogronnesby/billing-v2-planØyvind Grønnesby2023-10-172-0/+63
|\
| * Update plan for billing/v2Øyvind Grønnesby2023-10-172-0/+63
* | Allow no application resourcesValerij Fredriksen2023-10-172-39/+9
|/
* Eagerly serialize to stringBjørn Christian Seime2023-10-171-1/+1
* Merge pull request #28963 from vespa-engine/bjorncs/notificationBjørn Christian Seime2023-10-178-2/+3262
|\
| * Verify email content in unit testBjørn Christian Seime2023-10-176-1/+3259
| * Specify all required template parametersBjørn Christian Seime2023-10-171-0/+2
| * Remove trailing semi-colonBjørn Christian Seime2023-10-171-1/+1
* | Merge pull request #28952 from vespa-engine/bjorncs/email-notificationBjørn Christian Seime2023-10-174-9/+77
|\ \
| * | Include email content when persisting notificationBjørn Christian Seime2023-10-164-9/+77
* | | Merge pull request #28967 from vespa-engine/revert-28966-revert-28961-bjorncs...Bjørn Christian Seime2023-10-173-8/+16
|\ \ \
| * | | Revert "Revert "Set creator as contact when initiating new tenant""Bjørn Christian Seime2023-10-173-8/+16
* | | | 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
| | |/ | |/|
| * | 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
* | | | Add description for enclave item for total spendHarald Musum2023-10-172-32/+34
|/ / /
* | | Merge pull request #28949 from vespa-engine/olaa/billing-verificationOla Aunrønning2023-10-176-17/+59
|\ \ \ | |/ / |/| |
| * | Billing mail verificationOla Aunronning2023-10-166-17/+59
* | | Merge pull request #28909 from vespa-engine/maintain-invoicesGjøran Voldengen2023-10-173-6/+59
|\ \ \
| * | | 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-163-6/+55
| * | | 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-174-6/+103
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'origin/master' into ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-166-185/+152
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add additional items to billing/v2Øyvind Grønnesby2023-10-164-6/+103
| | |_|/ | |/| |
* | | | Merge pull request #28938 from vespa-engine/bjorncs/email-notificationØyvind Grønnesby2023-10-1610-6/+230
|\ \ \ \ | |_|/ / |/| | |
| * | | Test that trial notifications are triggeredBjørn Christian Seime2023-10-161-0/+38
| * | | Add feature flag to enable trial notificationsBjørn Christian Seime2023-10-161-4/+12
| * | | Add prototype email notification for trial account eventsBjørn Christian Seime2023-10-163-2/+98
| * | | Track trial account lifecycle in ZKBjørn Christian Seime2023-10-162-0/+68
| * | | Add notification type for account relatedBjørn Christian Seime2023-10-163-1/+8
| * | | Add additional overload taking email contentBjørn Christian Seime2023-10-161-3/+10
| |/ /
* | | Merge pull request #28944 from vespa-engine/hmusum/stop-using-name-per-applic...Harald Musum2023-10-162-15/+5
|\ \ \
| * | | Stop using name for each applicationHarald Musum2023-10-162-15/+5
* | | | Merge pull request #28940 from vespa-engine/mpolden/read-endpoint-config-flagMartin Polden2023-10-164-61/+48
|\ \ \ \ | |/ / / |/| | |
| * | | Enable testMartin Polden2023-10-161-20/+21
| * | | Read endpoint-config flagMartin Polden2023-10-164-41/+27
| |/ /
* / / Minor test cleanup and add enclave() method to ApplicationResourcesHarald Musum2023-10-141-114/+104
|/ /
* | Show cloud account used in each runjonmv2023-10-134-7/+15
* | Remove support for legacy price calculations from APIHarald Musum2023-10-132-111/+6
* | Test pricing API with 2 appsHarald Musum2023-10-132-3/+48
* | Update controller-server/src/main/java/com/yahoo/vespa/hosted/controller/rest...Harald Musum2023-10-131-2/+0
* | Support calculating and presenting prices per applications and in totalHarald Musum2023-10-132-37/+97
* | Parse numbers directly into BigDecimalHarald Musum2023-10-131-43/+44