summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
...
| * | Renaming and skeleton for stepsJon Marius Venstad2018-07-029-101/+215
| |/
* | Merge pull request #6334 from vespa-engine/mpolden/skip-config-convergence-ch...Harald Musum2018-07-0522-104/+69
|\ \
| * | Skip querying config convergence before application has upgradedMartin Polden2018-07-041-2/+2
| * | Use try-with-resourcesMartin Polden2018-07-041-9/+5
| * | Finalize fieldsMartin Polden2018-07-044-9/+9
| * | Simplify optional usageMartin Polden2018-07-041-3/+1
| * | Remove unused methods and parametersMartin Polden2018-07-046-23/+14
| * | Remove unused TimeoutExceptionMartin Polden2018-07-041-15/+0
| * | Remove superfluous semicolonsMartin Polden2018-07-044-9/+9
| * | Suppress unused warningMartin Polden2018-07-041-0/+1
| * | Clean up signatureMartin Polden2018-07-043-22/+20
| * | Fix javadocMartin Polden2018-07-041-3/+3
| * | SimplifyMartin Polden2018-07-041-9/+5
| |/
* | Revert "Avoid parsing proxied content"Martin Polden2018-07-042-27/+10
* | Add outstandingChange field to application APIMartin Polden2018-07-044-19/+147
* | Remove checked exceptions from assert methodsMartin Polden2018-07-041-11/+28
|/
* Merge pull request #6316 from vespa-engine/mpolden/reorganize-deployment-testsMartin Polden2018-07-0229-612/+502
|\
| * Initialize tester in @Before methodMartin Polden2018-06-291-10/+8
| * Remove unused methodsMartin Polden2018-06-291-39/+0
| * Move integration mocks to integration packageMartin Polden2018-06-2924-56/+59
| * Move testPlatformVersionSelection to DeploymentTriggerTestMartin Polden2018-06-292-106/+71
| * Reorganize helper methodsMartin Polden2018-06-291-77/+72
| * Move requeueOutOfCapacityStagingJob to DeploymentTriggerTestMartin Polden2018-06-292-107/+111
| * Move testUpdatesFailingJobStatus to DeploymentTriggerTestMartin Polden2018-06-293-51/+56
| * Simplify assertsMartin Polden2018-06-291-4/+4
| * Rename testMartin Polden2018-06-291-3/+2
| * Move tests from FailureRedeployerTest to DeploymentTriggerTestMartin Polden2018-06-292-186/+149
| * Remove duplicate ApplicationVersion formattingMartin Polden2018-06-291-6/+3
* | Deconstruct SystemUpgraderMartin Polden2018-06-291-1/+1
|/
* Use current system version for non-converging system applicationsMartin Polden2018-06-284-22/+65
* Avoid parsing proxied contentMartin Polden2018-06-272-10/+27
* Ensure that config has converged before changing system versionMartin Polden2018-06-277-22/+49
* Skip config convergence check for AWSMartin Polden2018-06-272-13/+24
* Merge pull request #6286 from vespa-engine/mpolden/rewrite-statuspage-proxyMartin Polden2018-06-2711-148/+389
|\
| * Avoid transitive dependency on undeclared libraryMartin Polden2018-06-261-7/+5
| * Remove container-jersey2Martin Polden2018-06-261-7/+0
| * Remove mockito-coreMartin Polden2018-06-261-6/+0
| * Rewrite StatusPage proxyMartin Polden2018-06-2610-128/+384
* | Require zone-application config to converge when upgradingMartin Polden2018-06-264-3/+43
* | slight changes in JSON formatting of doubles nowArne Juul2018-06-253-9/+9
|/
* Remove unused imports.gjoranv2018-06-222-2/+0
* Java 9: Truncate Instants from Instant.now() to MILLISgjoranv2018-06-223-23/+28
* Revert "Revert "Inject LogStore""Valerij Fredriksen2018-06-224-6/+10
* Revert "Inject LogStore"Harald Musum2018-06-224-10/+6
* Merge pull request #6253 from vespa-engine/freva/add-log-storeValerij Fredriksen2018-06-214-6/+10
|\
| * Move mock to stubsValerij Fredriksen2018-06-213-57/+2
| * Inject LogStoreValerij Fredriksen2018-06-215-6/+65
* | Remove Mockito usage from AthenzPrincipalFilterTestMartin Polden2018-06-212-59/+73
* | Remove Mockito usage from ControllerAuthorizationFilterTestMartin Polden2018-06-211-7/+7
* | Remove Mockito usage from MetricsReporterTestMartin Polden2018-06-211-10/+4
|/