summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix error messageHarald Musum2019-09-101-1/+1
* Merge pull request #10580 from vespa-engine/mortent/reapply-nlb-4443Andreas Eriksen2019-09-104-10/+9
|\
| * Use real port 4443 for NLBsMorten Tokle2019-09-104-10/+9
* | Merge pull request #10578 from vespa-engine/revert-10551-balder/merge-topn-in...Henning Baldersheim2019-09-101-33/+14
|\ \ | |/ |/|
| * Revert "Append all, the sort all, then trim tail is too expensive."Henning Baldersheim2019-09-101-33/+14
|/
* Merge pull request #10568 from vespa-engine/geirst/enum-store-cleanup-3Geir Storli2019-09-1031-487/+421
|\
| * Update class comment.Geir Storli2019-09-101-1/+1
| * Delay instantiation of enum store dictionary to after unique store is instant...Geir Storli2019-09-104-22/+32
| * Rename comparator_test.cpp -> enum_comparator_test.cpp.Geir Storli2019-09-096-16/+16
| * Remove wrapping of entry type in enum store.Geir Storli2019-09-0912-146/+111
| * Reduce code duplication by letting enum store comparators inherit unique stor...Geir Storli2019-09-0920-318/+277
* | Merge pull request #10567 from vespa-engine/mortent/remove-unused-aws-cred-pr...Martin Polden2019-09-103-116/+0
|\ \
| * | Remove unused credentials providerMorten Tokle2019-09-093-116/+0
| |/
* | Merge pull request #10577 from vespa-engine/jvenstad/avoid-field-name-conflic...Jon Marius Venstad2019-09-102-3/+3
|\ \
| * | Update unit test as wellJon Marius Venstad2019-09-101-1/+1
| * | Local endpoints field must be named something else than "clusters"Jon Marius Venstad2019-09-101-2/+2
|/ /
* | Merge pull request #10576 from vespa-engine/mpolden/handle-nullJon Marius Venstad2019-09-101-0/+1
|\ \
| * | Handle null node membershipMartin Polden2019-09-101-0/+1
|/ /
* | Merge pull request #10563 from vespa-engine/mpolden/move-configsrv-metricsMartin Polden2019-09-1019-260/+183
|\ \
| * | Move config server metrics fetching to controller-serverMartin Polden2019-09-0919-260/+183
| |/
* | Merge pull request #10575 from vespa-engine/revert-10569-balder/more-efficien...Henning Baldersheim2019-09-103-19/+8
|\ \
| * | Revert "Removing elements from an array is very costly."Henning Baldersheim2019-09-103-19/+8
|/ /
* | Merge pull request #10569 from vespa-engine/balder/more-efficient-trimJon Bratseth2019-09-093-8/+19
|\ \
| * | Propagate listenersJon Bratseth2019-09-092-8/+13
| * | Removing elements from an array is very costly.Henning Baldersheim2019-09-092-2/+8
| |/
* | Merge pull request #10574 from vespa-engine/freva/improve-messageValerij Fredriksen2019-09-091-21/+7
|\ \
| * | Simplify parent host to ready error message.Valerij Fredriksen2019-09-091-21/+7
|/ /
* | Merge pull request #10571 from vespa-engine/bratseth/access-control-in-defaul...Jon Bratseth2019-09-096-1/+17
|\ \
| * | Update abi specJon Bratseth2019-09-091-0/+1
| * | Don't enforce access control for non-default instancesJon Bratseth2019-09-095-1/+16
* | | Merge pull request #10551 from vespa-engine/balder/merge-topn-instead-of-appe...Henning Baldersheim2019-09-091-14/+33
|\ \ \
| * | | Append all, the sort all, then trim tail is too expensive.Henning Baldersheim2019-09-081-14/+33
* | | | Merge pull request #10573 from vespa-engine/jvenstad/retrying-tester-deployme...Jon Marius Venstad2019-09-091-2/+0
|\ \ \ \
| * | | | Must tallow tester deployment retryJon Marius Venstad2019-09-091-2/+0
* | | | | Merge pull request #10572 from vespa-engine/revert-10543-revert-10434-revert-...Jon Marius Venstad2019-09-094-9/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Revert "Revert "Revert "Revert "Use real port 4443 for NLBs"""" "Andreas Eriksen2019-09-094-9/+10
|/ / / /
* | | | Merge pull request #10566 from vespa-engine/gjoranv/remove-findbugs-annotationsHarald Musum2019-09-0923-91/+26
|\ \ \ \
| * | | | Remove findbugs annotations from code and build path.gjoranv2019-09-0923-91/+26
* | | | | Merge pull request #10554 from vespa-engine/yngveaasheim/add_search_protocol_...Geir Storli2019-09-091-0/+21
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [VESPA-16019] Add search_protocol metricsYngve Aasheim2019-09-091-0/+21
* | | | | Merge pull request #10565 from vespa-engine/bratseth/variants-on-instanceJon Bratseth2019-09-0924-179/+339
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Minor fixesJon Bratseth2019-09-095-1/+17
| * | | | Allow services.xml variants on application instance nameJon Bratseth2019-09-0921-179/+323
* | | | | Merge pull request #10555 from vespa-engine/bratseth/log-causeJon Bratseth2019-09-091-4/+4
|\ \ \ \ \
| * | | | | Don't castJon Bratseth2019-09-091-2/+2
| * | | | | Log cause directly to avoid it being truncated awayJon Bratseth2019-09-091-6/+6
* | | | | | Merge pull request #10561 from vespa-engine/smorgrav/list_users_not_idsTorbjørn Smørgrav2019-09-096-10/+84
|\ \ \ \ \ \
| * | | | | | Adjust test cases - they workedtoby2019-09-093-4/+11
| * | | | | | Actually add the nick/pic updatetoby2019-09-094-7/+74
* | | | | | | Merge pull request #10564 from vespa-engine/olaa/ignore-old-appsOla Aunrønning2019-09-093-2/+31
|\ \ \ \ \ \ \