summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4354 from vespa-engine/bjorncs/athenz-ca-in-truststoreBjørn Christian Seime2017-12-053-3/+9
|\
| * Load Athenz CA certificates to JDisc truststoreBjørn Christian Seime2017-12-053-3/+9
* | Merge pull request #4351 from vespa-engine/bjorncs/enable-athenz-tls-mainMorten Tokle2017-12-051-7/+0
|\ \ | |/ |/|
| * Enable Athenz TLS certificate for mainBjørn Christian Seime2017-12-051-7/+0
|/
* Merge pull request #4350 from vespa-engine/bjorncs/athenz-trust-storeMorten Tokle2017-12-053-1/+115
|\
| * Add trust store configurator with config server's CA certBjørn Christian Seime2017-12-053-1/+115
* | Merge pull request #4342 from vespa-engine/bjorncs/enforce-athenz-principalMorten Tokle2017-12-0526-281/+398
|\ \ | |/ |/|
| * Remove token signature from NToken.toString()Bjørn Christian Seime2017-12-041-1/+1
| * Cleanup authorization testing in ApplicationApiTestBjørn Christian Seime2017-12-043-109/+143
| * Introduce AthenzIdentity and AthenzUserBjørn Christian Seime2017-12-0422-165/+248
| * Remove dangling importBjørn Christian Seime2017-12-041-2/+0
| * The principal is always an AthenzPrincipalBjørn Christian Seime2017-12-041-4/+6
* | Merge pull request #4339 from vespa-engine/arnej/use-vespalib-metrics-in-logd-2Harald Musum2017-12-0512-23/+108
|\ \
| * | use more shared_ptrArne Juul2017-12-043-8/+10
| * | wire in a counter metricArne Juul2017-12-049-22/+69
| * | add metrics engineArne Juul2017-12-042-3/+22
| * | fix config generation reportingArne Juul2017-12-043-10/+27
* | | Merge pull request #4337 from vespa-engine/mpolden/update-name-service-interfaceMartin Polden2017-12-055-24/+43
|\ \ \
| * | | Shorten log messageMartin Polden2017-12-041-1/+3
| * | | Add removeRecord to NameServiceMartin Polden2017-12-045-23/+40
* | | | Merge pull request #4347 from vespa-engine/aressem/fix-config-and-upgrade-sce...Harald Musum2017-12-051-2/+7
|\ \ \ \
| * | | | Only delete user and profile if uninstalling. Keep changes to config files.Arnstein Ressem2017-12-041-2/+7
| | |/ / | |/| |
* | | | Merge pull request #4348 from vespa-engine/revert-4340-bjorncs/athenz-trust-s...Arnstein Ressem2017-12-053-115/+1
|\ \ \ \
| * | | | Revert "Add trust store configurator with config server's CA cert"Arnstein Ressem2017-12-053-115/+1
|/ / / /
* | | | Merge pull request #4346 from vespa-engine/geirst/expose-new-proton-resource-...Henning Baldersheim2017-12-041-0/+2
|\ \ \ \
| * | | | Expose new proton resource limit metrics.Geir Storli2017-12-041-0/+2
* | | | | Merge pull request #4345 from vespa-engine/geirst/add-metric-for-transaction-...Henning Baldersheim2017-12-047-13/+50
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add metric for replay time of the transaction log during start-up.Geir Storli2017-12-042-1/+4
| * | | | Track max session run time per Domain and return it as part of DomainInfo.Geir Storli2017-12-045-12/+46
|/ / / /
* | | | Merge pull request #4340 from vespa-engine/bjorncs/athenz-trust-storeBjørn Christian Seime2017-12-043-1/+115
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use Extension.basicConstraints instead of cryptic string idBjørn Christian Seime2017-12-041-2/+1
| * | | Add trust store configurator with config server's CA certBjørn Christian Seime2017-12-043-1/+116
* | | | Merge pull request #4341 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-12-041-1/+1
|\ \ \ \
| * | | | Use correct attribute for x509 cert chainBjørn Christian Seime2017-12-041-1/+1
|/ / / /
* | | | Merge pull request #4336 from vespa-engine/gjoranv/remove-container-dev-builderBjørn Christian Seime2017-12-048-320/+0
|\ \ \ \
| * | | | Remove unused module container-dev-builder.gjoranv2017-12-048-320/+0
| |/ / /
* | | | Merge pull request #4338 from vespa-engine/vekterli/remove-deprecated-memory-...Henning Baldersheim2017-12-0491-4419/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove unused (and not working) graphing utilitiesTor Brede Vekterli2017-12-0415-945/+0
| * | | Remove memory manager component from content layerTor Brede Vekterli2017-12-0478-3474/+26
| |/ /
* | | Merge pull request #4334 from vespa-engine/arnej/add-vespalib-metrics-7Arne H Juul2017-12-0465-27/+2409
|\ \ \ | |/ / |/| |
| * | move MockTickArne Juul2017-12-046-11/+10
| * | update metrics library after reviewsArne Juul2017-12-0432-341/+477
| * | review follow-upArne Juul2017-12-0329-182/+272
| * | update metrics library after reviewArne Juul2017-12-0349-559/+833
| * | first take on new simple metrics library.Arne Juul2017-12-0346-27/+1910
* | | Merge pull request #4328 from vespa-engine/vekterli/add-global-distribution-t...Tor Brede Vekterli2017-12-0412-68/+638
|\ \ \ | |_|/ |/| |
| * | Add utility for transforming default distribution config to globalTor Brede Vekterli2017-12-015-0/+560
| * | Remove no-op code and clean up DistributionTor Brede Vekterli2017-12-015-48/+58
| * | Less Gallic influence on namingTor Brede Vekterli2017-12-012-20/+20
* | | Merge pull request #4331 from vespa-engine/hmusum/handle-file-already-existingHenning Baldersheim2017-12-041-5/+19
|\ \ \