aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | | | Disable client caching of error responsesBjørn Christian Seime2018-06-201-0/+1
| * | | | | Correct unintentional method nameBjørn Christian Seime2018-06-203-3/+3
| * | | | | Add new Athenz security filter based on ZPEBjørn Christian Seime2018-06-209-0/+407
| * | | | | Add roles to AthenzPrincipalBjørn Christian Seime2018-06-201-3/+19
| * | | | | Remove unused classBjørn Christian Seime2018-06-201-27/+0
| * | | | | Add wrapper for ZPEBjørn Christian Seime2018-06-206-0/+133
| * | | | | Add data type for resource nameBjørn Christian Seime2018-06-202-0/+95
| * | | | | Parse role token and add getter for identityBjørn Christian Seime2018-06-201-6/+24
* | | | | | Merge pull request #6254 from vespa-engine/bjorncs/keystoreBjørn Christian Seime2018-06-211-38/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove CA certificate from keystoreBjørn Christian Seime2018-06-211-38/+13
|/ / / / /
* | | | | Merge pull request #6249 from vespa-engine/geirst/correct-name-of-docs-matche...Geir Storli2018-06-201-2/+2
|\ \ \ \ \
| * | | | | Correct the name used for *.docs_matched metrics (which are of type LongCount...Geir Storli2018-06-201-2/+2
* | | | | | Merge pull request #6248 from vespa-engine/vekterli/export-aggregated-visit-a...Geir Storli2018-06-201-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Export aggregated visit and deletebuckets metricsTor Brede Vekterli2018-06-201-0/+4
* | | | | | Merge pull request #6247 from vespa-engine/vekterli/also-log-config-changes-f...Tor Brede Vekterli2018-06-205-13/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Log config changes from Bouncer componentTor Brede Vekterli2018-06-205-13/+37
| | |_|/ / | |/| | |
* | | | | Merge pull request #6243 from vespa-engine/bratseth/nonfunctional-changes-2gjoranv2018-06-2031-62/+85
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Nonfunctional changesJon Bratseth2018-06-2031-62/+85