summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Use '@Inject' from 'annotations' in multiple bundlesBjørn Christian Seime2022-05-0623-23/+23
* Merge pull request #22471 from vespa-engine/jonmv/fix-dep-orch-hiccup-for-tes...Jon Marius Venstad2022-05-065-28/+167
|\
| * Improve decision making for instances with only testsjonmv2022-05-054-7/+144
| * Use java.util.function.Supplierjonmv2022-05-051-21/+23
* | Merge pull request #22436 from vespa-engine/olaa/cmr-skip-weekendsOla Aunrønning2022-05-052-3/+27
|\ \
| * | Ignore weekends when considering retirement time. Adjust from 60 to 48 hoursOla Aunrønning2022-05-042-3/+27
* | | Merge pull request #22424 from vespa-engine/ogronnesby/accountant-can-change-...Øyvind Grønnesby2022-05-058-11/+24
|\ \ \ | |_|/ |/| |
| * | Update tests with new setPlan signatureØyvind Grønnesby2022-05-045-8/+8
| * | Update BillingApiHandlerV2 with new setPlanØyvind Grønnesby2022-05-031-1/+1
| * | Update CloudTrialExpirer's use of setPlanØyvind Grønnesby2022-05-031-1/+1
| * | Allow hostedAccountant to bypass some checksØyvind Grønnesby2022-05-031-1/+14
* | | Merge pull request #22438 from vespa-engine/mpolden/cleanupMartin Polden2022-05-057-20/+6
|\ \ \
| * | | Remove unnecessary packageMartin Polden2022-05-044-7/+2
| * | | Remove unused variableMartin Polden2022-05-041-1/+0
| * | | SimplifyMartin Polden2022-05-041-6/+4
| * | | Remove unused methodMartin Polden2022-05-041-6/+0
| | |/ | |/|
* | | Merge pull request #22443 from vespa-engine/mpolden/fix-image-expiryMartin Polden2022-05-051-4/+7
|\ \ \
| * | | Include architecture in ContainerImage tagMartin Polden2022-05-041-4/+7
| |/ /
* / / Revert "Maintain archive access for controller"Håkon Hallingstad2022-05-042-15/+10
|/ /
* | Abort running deployment jobs on deactivatejonmv2022-05-031-0/+3
* | Revert "Merge pull request #22393 from vespa-engine/revert-22386-jonmv/remove...jonmv2022-05-031-1/+3
* | Revert "Remove another HTTP client wrapper"Harald Musum2022-05-021-3/+1
* | Merge pull request #22386 from vespa-engine/jonmv/remove-last-controller-jers...Jon Marius Venstad2022-05-021-1/+3
|\ \
| * | Handle null header valuejonmv2022-05-021-1/+3
| |/
* | Maintain archive access for controllerHåkon Hallingstad2022-05-022-10/+15
* | Add feature flag to toggle notification dispatchEirik Nygaard2022-05-023-5/+20
|/
* Merge pull request #22354 from vespa-engine/jonmv/fix-parent-versionValerij Fredriksen2022-04-291-1/+4
|\
| * Fix parse helperjonmv2022-04-291-1/+4
* | Merge pull request #22349 from vespa-engine/jonmv/handle-no-stuies-beterValerij Fredriksen2022-04-281-1/+1
|\ \
| * | Handle no suites betterjonmv2022-04-281-1/+1
| |/
* / Discard notification entires with outdated job typejonmv2022-04-281-0/+10
|/
* Merge remote-tracking branch 'origin/master' into ogronnesby/billing-v2-fixesØyvind Grønnesby2022-04-27275-3505/+4318
|\
| * Merge pull request #22307 from vespa-engine/jonmv/warn-on-old-parentValerij Fredriksen2022-04-2711-61/+120
| |\
| | * Add new field to test datajonmv2022-04-271-1/+3
| | * Do not require all fields in build metajonmv2022-04-271-1/+1
| | * Warn when application is built with a parent on lower major than the systemjonmv2022-04-276-4/+23
| | * Put submission stuff in a separate classjonmv2022-04-277-57/+95
| * | Merge pull request #22303 from vespa-engine/ogronnesby/trial-expirer-fixesØyvind Grønnesby2022-04-272-5/+24
| |\ \ | | |/ | |/|
| | * Remove empy apps for expiring tenantsØyvind Grønnesby2022-04-272-5/+24
| * | Move User from controller-api to jdisc-security-filtersBjørn Christian Seime2022-04-276-7/+6
| * | Merge pull request #22283 from vespa-engine/hakon/lock-debuggingJon Marius Venstad2022-04-261-2/+9
| |\ \
| | * | Handle lock release exceptionHåkon Hallingstad2022-04-261-3/+9
| * | | Merge pull request #22238 from vespa-engine/ean/better-subject-formattingEirik Nygaard2022-04-261-2/+10
| |\ \ \
| | * | | remove useless toString() callEirik Nygaard2022-04-241-1/+1
| | * | | Pretty print application id source, with standard serializationEirik Nygaard2022-04-241-1/+9
| * | | | Merge pull request #22236 from vespa-engine/ean/link-to-applicationEirik Nygaard2022-04-262-9/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Notifications should link to tenant and application name combinationEirik Nygaard2022-04-242-9/+18
| | |/ /
| * | | Merge pull request #22260 from vespa-engine/jonmv/add-test-categories-headerJon Marius Venstad2022-04-2615-244/+607
| |\ \ \
| | * | | Fix serialisation of noTests, and remove unused codejonmv2022-04-262-15/+1
| | * | | Move test package logic to separate class, with validation, resulting in noti...jonmv2022-04-2514-213/+584