summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.105.45-1].vespa-7.105.45-1sd-buildbot2019-09-164-1/+2
* Merge pull request #10619 from vespa-engine/revert-10580-mortent/reapply-nlb-...Andreas Eriksen2019-09-124-9/+10
|\
| * Revert "Reapply: "Use real port 4443 for NLBs""Morten Tokle2019-09-124-9/+10
|/
* Merge pull request #10618 from vespa-engine/mortent/whitelist-tester-pathsJon Marius Venstad2019-09-112-0/+2
|\
| * Whitelist /state/v1/configMorten Tokle2019-09-112-0/+2
|/
* Merge pull request #10616 from vespa-engine/bjorncs/fixHåkon Hallingstad2019-09-111-0/+6
|\
| * Add http-utils to configserver's pom.xmlBjørn Christian Seime2019-09-111-0/+6
|/
* Merge pull request #10614 from vespa-engine/mortent/steprunner-correct-domain-cdBjørn Christian Seime2019-09-112-4/+5
|\
| * Use correct domain in cdMorten Tokle2019-09-112-4/+5
|/
* Merge pull request #10611 from vespa-engine/mortent/logserver-httpsBjørn Christian Seime2019-09-111-2/+2
|\
| * Get logs using httpsMorten Tokle2019-09-111-2/+2
|/
* Merge pull request #10610 from vespa-engine/mortent/fix-invalid-connectorconfigMorten Tokle2019-09-112-16/+16
|\
| * Move config overrideMorten Tokle2019-09-112-16/+16
|/
* Merge pull request #10603 from vespa-engine/mortent/setup-tester-tlsJon Marius Venstad2019-09-112-0/+30
|\
| * Setup tls for tester appMorten Tokle2019-09-112-0/+30
|/
* Merge pull request #10596 from vespa-engine/balder/auxiliary-hits-are-not-mer...Henning Baldersheim2019-09-113-11/+161
|\
| * Check for auxiliary hits in first chunk explicitHenning Baldersheim2019-09-111-1/+10
| * Add minmal testing of merge and offset and auxiliary hits.Henning Baldersheim2019-09-113-4/+127
| * Also consider auxiliary hits.Henning Baldersheim2019-09-101-6/+24
|/
* Merge pull request #10595 from vespa-engine/revert-10594-revert-10593-balder/...Henning Baldersheim2019-09-104-20/+33
|\
| * Update abiHenning Baldersheim2019-09-101-0/+1
| * Revert "Revert "Make fasthit leaner since it appears in considerable amounts ...Henning Baldersheim2019-09-103-20/+32
|/
* Merge pull request #10594 from vespa-engine/revert-10593-balder/make-fasthit-...Henning Baldersheim2019-09-103-32/+20
|\
| * Revert "Make fasthit leaner since it appears in considerable amounts during m...Harald Musum2019-09-103-32/+20
|/
* Merge pull request #10593 from vespa-engine/balder/make-fasthit-leanerHenning Baldersheim2019-09-103-20/+32
|\
| * Make fasthit leaner since it appears in considerable amounts during merging, ...Henning Baldersheim2019-09-103-20/+32
|/
* Merge pull request #10591 from vespa-engine/balder/merge-topn-instead-of-appe...Henning Baldersheim2019-09-104-30/+55
|\
| * HitGroup.sort and hit.compareTo must ensure same ordering...Henning Baldersheim2019-09-104-25/+31
| * Revert "Revert "Append all, the sort all, then trim tail is too expensive.""Henning Baldersheim2019-09-101-14/+33
* | Merge pull request #10592 from vespa-engine/geirst/enum-store-cleanup-4Geir Storli2019-09-1019-148/+106
|\ \ | |/ |/|
| * Remove unused functions.Geir Storli2019-09-105-11/+0
| * Simplify how we iterate the set of unique values when saving an enumerated at...Geir Storli2019-09-1011-48/+13
| * Stop exposing low-level data store out of enum store.Geir Storli2019-09-1011-19/+38
| * Remove decRefCount() from enum store API.Geir Storli2019-09-102-11/+10
| * Rename addEnum() -> insert() and change semantics to increase ref count.Geir Storli2019-09-104-60/+46
* | Merge pull request #10589 from vespa-engine/jvenstad/point-plugins-to-public-...Jon Marius Venstad2019-09-101-1/+1
|\ \
| * | Point OS Vespa Maven plugins to public API by defaultJon Marius Venstad2019-09-101-1/+1
|/ /
* | Merge pull request #10588 from vespa-engine/jvenstad/always-assume-athenz-cre...Jon Marius Venstad2019-09-101-1/+1
|\ \
| * | Always assume Athenz credentials when not in publicJon Marius Venstad2019-09-101-1/+1
* | | Merge pull request #10587 from vespa-engine/jvenstad/catch-and-log-in-jobrunnerJon Marius Venstad2019-09-101-1/+11
|\ \ \ | |/ / |/| |
| * | Catch exceptions in JobRunner, rather than leaking to stderrJon Marius Venstad2019-09-101-1/+11
* | | Merge pull request #10585 from vespa-engine/toregge/allocate-enum-values-earlierGeir Storli2019-09-102-1/+10
|\ \ \ | |/ / |/| |
| * | Allocate nested vector used to map from EntryRef to enum value earlierTor Egge2019-09-102-1/+10
* | | Merge pull request #10586 from vespa-engine/bjorncs/node-admin-access-logBjørn Christian Seime2019-09-101-0/+2
|\ \ \
| * | | Add json access logging to node-adminBjørn Christian Seime2019-09-101-0/+2
|/ / /
* | | Merge pull request #10583 from vespa-engine/mpolden/create-dns-names-in-contr...Martin Polden2019-09-1021-40/+86
|\ \ \ | |/ / |/| |
| * | Move Athenz mocks to controller-apiMartin Polden2019-09-1014-31/+23
| * | Move CostReportConsumerMock to controller-apiMartin Polden2019-09-103-5/+3
| * | Let controller build list of certificate DNS namesMartin Polden2019-09-105-4/+60
* | | Merge pull request #10221 from vespa-engine/revert-10220-jvenstad/http-443-in...Andreas Eriksen2019-09-101-3/+1
|\ \ \