summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Set error in connection pool when request failsHarald Musum2017-11-231-5/+8
* Make sure to choose a new connection if file reference not foundHarald Musum2017-11-231-0/+1
* Merge pull request #4241 from vespa-engine/bratseth/select-1-host-by-indexJon Bratseth2017-11-236-80/+157
|\
| * Pick 1 cluster controller by indexJon Bratseth2017-11-223-20/+67
| * Pick 1 slobrok by indexJon Bratseth2017-11-222-4/+4
| * Prepare to select slobroks by index (no change)Jon Bratseth2017-11-223-24/+32
| * Prepare to select host by index (no change)Jon Bratseth2017-11-224-71/+93
* | Merge pull request #4247 from vespa-engine/mpolden/import-zone-api-v2Jon Bratseth2017-11-2321-10/+1028
|\ \
| * | Reimplement /zone/v2Martin Polden2017-11-229-2/+325
| * | Import proxy packageMartin Polden2017-11-229-0/+675
| * | Set correct URL in defaultRegionMartin Polden2017-11-224-8/+28
| |/
* | Merge pull request #4252 from vespa-engine/hmusum/download-from-another-confi...Henning Baldersheim2017-11-236-22/+124
|\ \
| * | Add support for downloading from another config serverHarald Musum2017-11-236-22/+124
* | | Merge pull request #4253 from vespa-engine/hmusum/reduce-log-noiseMartin Polden2017-11-231-1/+2
|\ \ \ | |/ / |/| |
| * | Reduce log noise: No need to log stack traceHarald Musum2017-11-231-1/+2
|/ /
* | Merge pull request #4251 from vespa-engine/bjorncs/exclude-jackson-from-athen...Bjørn Christian Seime2017-11-221-0/+26
|\ \
| * | Exclude all Jackson deps from athenz zms/zts java clientBjørn Christian Seime2017-11-221-0/+26
|/ /
* | Merge pull request #4238 from vespa-engine/lesters/add-elu-to-backendLester Solbakken2017-11-2215-6/+44
|\ \
| * | added type resolving test for elu operatorHåvard Pettersen2017-11-221-0/+1
| * | Add new tensor conformance test with elu'sLester Solbakken2017-11-221-1/+19
| * | Add Elu test to c++ conformance testLester Solbakken2017-11-221-3/+4
| * | Add Elu as a backend ranking functionLester Solbakken2017-11-2212-2/+20
| |/
* | Merge pull request #4250 from vespa-engine/bjorncs/improve-user-auth-with-ath...Bjørn Christian Seime2017-11-223-19/+26
|\ \
| * | Match Before annotation is the internal user auth filterBjørn Christian Seime2017-11-221-2/+0
| * | Improve error message when user authentication failsBjørn Christian Seime2017-11-223-17/+26
|/ /
* | Merge pull request #4240 from vespa-engine/bjorncs/rewrite-user-principal-to-...Bjørn Christian Seime2017-11-221-3/+27
|\ \
| * | Improve error messageBjørn Christian Seime2017-11-221-1/+1
| * | Rename method to better indicate its functionBjørn Christian Seime2017-11-221-2/+2
| * | Rewrite user principal as Athenz principalBjørn Christian Seime2017-11-221-0/+24
* | | Merge pull request #4244 from vespa-engine/geirst/add-named-bucket-space-to-d...Tor Brede Vekterli2017-11-2216-181/+240
|\ \ \
| * | | Cleanup: Use helper functions to convert document api messages <-> storage ap...Geir Storli2017-11-221-122/+68
| * | | Cleanup: use std::make_shared and std::make_unique.Geir Storli2017-11-221-9/+8
| * | | Add named bucket space to RemoveLocationMessage.Geir Storli2017-11-224-2/+24
| * | | Add named bucket space to GetBucketListMessage.Geir Storli2017-11-228-27/+39
| * | | Add named bucket space to StatBucketMessage.Geir Storli2017-11-228-30/+63
| * | | Add named bucket space to CreateVisitorMessage.Geir Storli2017-11-226-3/+50
| |/ /
* | | Merge pull request #4249 from vespa-engine/bjorncs/jackson-datatype-jsr310gjoranv2017-11-222-2/+5
|\ \ \
| * | | Beautify with line breaksBjørn Christian Seime2017-11-221-1/+3
| * | | Add jackson-datatype-jsr310 to preinstall listBjørn Christian Seime2017-11-221-1/+2
|/ / /
* | | Merge pull request #4248 from vespa-engine/bjorncs/use-port-4443Bjørn Christian Seime2017-11-221-1/+1
|\ \ \
| * | | Change identity document endpoint port from 8443 -> 4443Bjørn Christian Seime2017-11-221-1/+1
|/ / /
* | | Merge pull request #4245 from vespa-engine/bjorncs/jacksonBjørn Christian Seime2017-11-224-7/+35
|\ \ \
| * | | Add JavaTimeModule to Jersey. Exclude Jackson from athenz bundleBjørn Christian Seime2017-11-224-7/+35
* | | | Merge pull request #4235 from vespa-engine/toregge/use-distributor-bucket-spa...Geir Storli2017-11-221-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Use DistributorBucketSpace to get Distribution in Distributor.Tor Egge2017-11-221-1/+3
* | | | Merge pull request #4242 from vespa-engine/bratseth/count-prod-onlyMorten Tokle2017-11-222-3/+8
|\ \ \ \
| * | | | Count prod onlyJon Bratseth2017-11-222-3/+8
* | | | | Merge pull request #4243 from vespa-engine/bjorncs/test-serializationValerij Fredriksen2017-11-221-0/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add unit test for CsrSerializedPayload deserializationBjørn Christian Seime2017-11-221-0/+32
| | |/ / | |/| |
* | | | Merge pull request #4239 from vespa-engine/balder/use-c++11-for-loopsHenning Baldersheim2017-11-221-11/+6
|\ \ \ \ | |/ / / |/| | |