summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fix such that a predicate field can be imported from a parent into a child type.Geir Storli2017-12-066-1/+46
* | | | | Merge pull request #4376 from vespa-engine/hakonhall/fix-pathsArnstein Ressem2017-12-071-2/+2
|\ \ \ \ \
| * | | | | Fix paths in node-admin RPMHåkon Hallingstad2017-12-071-2/+2
* | | | | | Merge pull request #4381 from vespa-engine/hmusum/handle-directory-filereferenceHenning Baldersheim2017-12-0712-90/+403
|\ \ \ \ \ \
| * | | | | | Handle that a file reference is a directory with many filesHarald Musum2017-12-0712-90/+403
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4382 from vespa-engine/hmusum/new-ownersHenning Baldersheim2017-12-071-1/+2
|\ \ \ \ \ \
| * | | | | | New ownersHarald Musum2017-12-071-1/+2
| |/ / / / /
* | | | | | Merge pull request #4383 from vespa-engine/jvenstad/filter-out-aws-zoneTorbjørn Smørgrav2017-12-071-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ignore ocnfigserver versios in AWSJon Marius Venstad2017-12-071-3/+5
|/ / / / /
* | | | | Merge pull request #4380 from vespa-engine/arnej/add-logd-processed-lines-to-...Harald Musum2017-12-071-0/+1
|\ \ \ \ \
| * | | | | add "logd.processed.lines" to VespaMetricSetArne Juul2017-12-071-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4379 from vespa-engine/toregge/protect-vector-of-earlier-...Henning Baldersheim2017-12-072-5/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Protect vector of earlier protocols with a lock, to avoid race conditions.Tor Egge2017-12-072-5/+9
|/ / / /
* | | | Merge pull request #4372 from vespa-engine/arnej/vespalib-metrics-update-9Håvard Pettersen2017-12-0724-128/+234
|\ \ \ \
| * | | | integrate new MockTick from havardpeArne Juul2017-12-056-112/+91
| * | | | update metrics library after reviewArne Juul2017-12-0524-55/+182
* | | | | Merge pull request #4377 from vespa-engine/toregge/use-alternate-maxflushed-p...Henning Baldersheim2017-12-0728-21/+228
|\ \ \ \ \
| * | | | | Use alternate maxflushed parameter (max number of flushed memory indexesTor Egge2017-12-0728-21/+228
| | |/ / / | |/| | |
* | | | | Merge pull request #4126 from vespa-engine/vekterli/move-to-flex-bison-parsin...Tor Brede Vekterli2017-12-0733-1809/+1249
|\ \ \ \ \
| * | | | | Use new C++ document selection parserTor Brede Vekterli2017-11-1433-1809/+1249
* | | | | | Merge pull request #4375 from vespa-engine/aressem/disable-filedistribution-b...Henning Baldersheim2017-12-071-0/+1
|\ \ \ \ \ \
| * | | | | | Disable filedistribution by default.Arnstein Ressem2017-12-071-0/+1
* | | | | | | Merge pull request #4363 from vespa-engine/hmusum/remove-unused-methodMorten Tokle2017-12-071-9/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove unused method from APIHarald Musum2017-12-061-9/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4369 from vespa-engine/bjorncs/more-robust-ssl-initBjørn Christian Seime2017-12-061-21/+41
|\ \ \ \ \ \
| * | | | | | Remove unnecessary use of AtomicReferenceBjørn Christian Seime2017-12-061-4/+4
| * | | | | | Retrieve initial certificate in constructor for fail-fast semanticsBjørn Christian Seime2017-12-061-19/+41
| * | | | | | Don't warn when actual expiry is longer than expectedBjørn Christian Seime2017-12-061-7/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4371 from vespa-engine/gjoranv/parent-pom-fixMorten Tokle2017-12-062-35/+51
|\ \ \ \ \ \
| * | | | | | Add missing elements to container-dependency-versions pom.gjoranv2017-12-062-35/+51
* | | | | | | Merge pull request #4368 from vespa-engine/bjorncs/fixValerij Fredriksen2017-12-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix silly bugBjørn Christian Seime2017-12-061-1/+1
| |/ / / / /
* | | | | | Merge pull request #4367 from vespa-engine/balder/fix-logic-flaw-causing-miss...Henning Baldersheim2017-12-0618-521/+76
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add some more logging and only update config if md5 has changed.Henning Baldersheim2017-12-061-2/+6
| * | | | | Set _configState before calling out to holder.Henning Baldersheim2017-12-061-1/+1
| * | | | | Revert "Revert "Balder/fix logic flaw causing missing config changes""Henning Baldersheim2017-12-0618-522/+73
|/ / / / /
* | | | | Merge pull request #4365 from vespa-engine/bjorncs/move-athenz-api-to-control...Morten Tokle2017-12-0643-330/+281
|\ \ \ \ \
| * | | | | Add class for Athenz role tokenBjørn Christian Seime2017-12-061-0/+36
| * | | | | Move all Athenz API classes to controller-apiBjørn Christian Seime2017-12-0640-113/+121
| * | | | | Add NToken to AthenzPrincipalBjørn Christian Seime2017-12-065-6/+20
| * | | | | remove reference ZMSClientException/ZTSClientExceptionBjørn Christian Seime2017-12-065-16/+14
| * | | | | Remove reference to PrincipalToken from NTokenBjørn Christian Seime2017-12-067-156/+51
* | | | | | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxyBjørn Christian Seime2017-12-061-10/+4
|\ \ \ \ \ \
| * | | | | | Remove Context from proxy methodsValerij Fredriksen2017-12-051-10/+4
* | | | | | | Merge pull request #4366 from vespa-engine/vekterli/disallow-empty-user-group...Henning Baldersheim2017-12-062-6/+45
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Disallow ID strings with empty user/group valuesTor Brede Vekterli2017-12-062-6/+45
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4364 from vespa-engine/bjorncs/use-same-issuer-nameMorten Tokle2017-12-061-5/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Match issuer name defined in self-signed cert in trust storeBjørn Christian Seime2017-12-061-5/+8
|/ / / / /
* | | | | Merge pull request #4333 from vespa-engine/hakonhall/support-making-standalon...Håkon Hallingstad2017-12-066-0/+682
|\ \ \ \ \
| * | | | | Fix review commentsHåkon Hallingstad2017-12-054-17/+110