summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove Scala remnants from Maven build filesOlli Virtanen2018-06-259-153/+0
* Merge pull request #6270 from vespa-engine/hmusum/build-model-for-wanted-vesp...Jon Bratseth2018-06-256-58/+67
|\
| * Make sure to build config model for wanted vespa version as wellHarald Musum2018-06-256-58/+67
|/
* Merge pull request #6258 from vespa-engine/ovirtanen/convert-scala-to-java-in...Olli Virtanen2018-06-2548-3231/+4064
|\
| * Class constant Logger moved to topOlli Virtanen2018-06-211-2/+2
| * Removed two leftover comments about Scala default values for parametersOlli Virtanen2018-06-211-4/+2
| * Scala code in container-di converted to JavaOlli Virtanen2018-06-2148-3231/+4066
* | Merge pull request #6268 from vespa-engine/arnej/add-container-latency-searcherArne H Juul2018-06-222-1/+39
|\ \
| * | build Point every timeArne Juul2018-06-221-6/+3
| * | add ContainerLatencySearcherArne Juul2018-06-222-1/+42
* | | Merge pull request #6267 from vespa-engine/gjoranv/truncate-to-msMartin Polden2018-06-225-30/+36
|\ \ \
| * | | Remove unused imports.gjoranv2018-06-224-4/+0
| * | | Java 9: Truncate Instants from Instant.now() to MILLISgjoranv2018-06-225-30/+40
|/ / /
* | | Merge pull request #6265 from vespa-engine/hmusum/retry-deployment-at-bootstrapHarald Musum2018-06-226-20/+63
|\ \ \
| * | | Retry redeployment of applications if that failsHarald Musum2018-06-226-20/+63
* | | | Merge pull request #6264 from vespa-engine/revert-6260-revert-6256-hakonhall/...Håkon Hallingstad2018-06-2216-324/+165
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused WallClockSource from package to exportHåkon Hallingstad2018-06-223-205/+1
| * | | Export com.yahoo.timeHåkon Hallingstad2018-06-221-0/+5
| * | | Revert "Revert "Move TimeBudget to vespajlib and use Clock""Håkon Hallingstad2018-06-2213-120/+160
* | | | Merge pull request #6263 from vespa-engine/revert-6262-revert-6253-freva/add-...Valerij Fredriksen2018-06-226-14/+83
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Revert "Inject LogStore""Valerij Fredriksen2018-06-226-14/+83
* | | | Merge pull request #6257 from vespa-engine/mpolden/vespa-deploy-version-param...Harald Musum2018-06-221-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Add option for Vespa version in deploy scriptMartin Polden2018-06-211-3/+4
* | | | Merge pull request #6262 from vespa-engine/revert-6253-freva/add-log-storeValerij Fredriksen2018-06-226-83/+14
|\ \ \ \
| * | | | Revert "Inject LogStore"Harald Musum2018-06-226-83/+14
|/ / / /
* | | | Merge pull request #6260 from vespa-engine/revert-6256-hakonhall/move-timebud...Arnstein Ressem2018-06-2113-160/+120
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Move TimeBudget to vespajlib and use Clock"Harald Musum2018-06-2113-160/+120
|/ / /
* | | Merge pull request #6256 from vespa-engine/hakonhall/move-timebudget-to-vespa...Håkon Hallingstad2018-06-2113-120/+160
|\ \ \
| * | | Use UncheckedTimeoutException from guavaHåkon Hallingstad2018-06-215-25/+11
| * | | Use ManualClock and remove Unchecked prefixHåkon Hallingstad2018-06-216-16/+23
| * | | Move TimeBudget to vespajlib and use ClockHåkon Hallingstad2018-06-2113-120/+167
| | |/ | |/|
* | | Merge pull request #6253 from vespa-engine/freva/add-log-storeValerij Fredriksen2018-06-216-14/+83
|\ \ \ | |_|/ |/| |
| * | Move mock to stubsValerij Fredriksen2018-06-213-3/+3
| * | Inject LogStoreValerij Fredriksen2018-06-216-14/+83
| |/
* | Merge pull request #6255 from vespa-engine/balder/invert-and-simplifyHenning Baldersheim2018-06-211-8/+5
|\ \
| * | Invert the logic and simplify the loop.Henning Baldersheim2018-06-211-8/+5
* | | Merge pull request #6250 from vespa-engine/mpolden/less-mockitoJon Bratseth2018-06-215-85/+103
|\ \ \
| * | | 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-212-19/+23
* | | | Merge pull request #6180 from vespa-engine/arnej/use-log-abortHenning Baldersheim2018-06-21182-241/+539
|\ \ \ \
| * | | | use new C++ noreturn syntaxArne Juul2018-06-211-3/+4
| * | | | some more cleanupArne Juul2018-06-2032-67/+47
| * | | | move LOG_SETUP after other includesArne Juul2018-06-2094-228/+253
| * | | | add and use HDR_ABORT insteadArne Juul2018-06-2020-35/+87
| * | | | Merge branch 'master' into arnej/use-log-abortArne Juul2018-06-20428-4821/+8601
| |\ \ \ \
| * | | | | use LOG_ABORT not just abort()Arne Juul2018-06-12176-248/+488
* | | | | | Merge pull request #6245 from vespa-engine/bjorncs/athenz-filterMorten Tokle2018-06-2121-36/+679
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix typoBjørn Christian Seime2018-06-211-1/+1
| * | | | | Rename 'AccessCheckResult' -> 'AuthorizationResult'Bjørn Christian Seime2018-06-215-24/+24