summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Support node admin modesHåkon Hallingstad2017-12-227-86/+228
* Merge pull request #4514 from vespa-engine/revert-4506-revert-4496-revert-448...Håkon Hallingstad2017-12-219-236/+32
|\
| * Revert "Revert "Revert "Prepare for making node admin components optional"""Håkon Hallingstad2017-12-219-236/+32
|/
* Merge pull request #4513 from vespa-engine/revert-4512-hakonhall/make-nodeadm...Håkon Hallingstad2017-12-211-3/+3
|\
| * Revert "Make NodeAdminComponent constructor public"Håkon Hallingstad2017-12-211-3/+3
|/
* Merge pull request #4512 from vespa-engine/hakonhall/make-nodeadmincomponent-...Kristian Aune2017-12-211-3/+3
|\
| * Make NodeAdminComponent constructor publicHåkon Hallingstad2017-12-211-3/+3
|/
* Merge pull request #4506 from vespa-engine/revert-4496-revert-4489-hakonhall/...Håkon Hallingstad2017-12-219-32/+236
|\
| * Revert "Revert "Prepare for making node admin components optional""Håkon Hallingstad2017-12-209-32/+236
* | Merge pull request #4505 from vespa-engine/hakonhall/allow-localhost-zk-affinityHåkon Hallingstad2017-12-214-14/+44
|\ \
| * | Allow localhost zk affinityHåkon Hallingstad2017-12-204-14/+44
* | | Merge pull request #4499 from vespa-engine/bratseth/long-dimensionsLester Solbakken2017-12-2123-276/+276
|\ \ \
| * | | Restore importJon Bratseth2017-12-201-0/+1
| * | | Merge branch 'master' into bratseth/long-dimensionsJon Bratseth2017-12-2059-455/+458
| |\ \ \
| * | | | Use longs for dimensions lengths in all API'sJon Bratseth2017-12-1923-280/+279
* | | | | Merge pull request #4509 from vespa-engine/bratseth/tensorflow-models-2Lester Solbakken2017-12-214-77/+128
|\ \ \ \ \
| * | | | | SimplifyJon Bratseth2017-12-201-14/+5
| * | | | | Only import onceJon Bratseth2017-12-203-45/+47
| * | | | | SimplifyJon Bratseth2017-12-202-25/+21
| * | | | | Model signatures in import resultsJon Bratseth2017-12-204-61/+123
| | |/ / / | |/| | |
* | | | | Merge pull request #4508 from vespa-engine/revert-4504-hmusum/order-zookeeper...Håkon Hallingstad2017-12-202-36/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Hmusum/order zookeeper server list so localhost comes first"Harald Musum2017-12-202-36/+11
|/ / / /
* | | | Merge pull request #4504 from vespa-engine/hmusum/order-zookeeper-server-list...Henning Baldersheim2017-12-202-11/+36
|\ \ \ \
| * | | | Test with more servers in listHarald Musum2017-12-202-4/+7
| * | | | Remove debug linesHarald Musum2017-12-201-3/+0
| * | | | Order config server connect string so that localhost always comes firstHarald Musum2017-12-202-11/+36
| |/ / /
* | | | Merge pull request #4503 from vespa-engine/hakonhall/increase-node-admin-delaysHarald Musum2017-12-202-2/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Increase node admin delaysHåkon Hallingstad2017-12-202-2/+4
| |/ /
* | | Merge pull request #4502 from vespa-engine/arnej/protect-against-empty-node-listHenning Baldersheim2017-12-201-1/+1
|\ \ \ | |/ / |/| |
| * | an entry with no nodes cannot be usedArne Juul2017-12-201-1/+1
|/ /
* | Merge pull request #4500 from vespa-engine/hmusum/minor-cleanupHenning Baldersheim2017-12-204-11/+6
|\ \
| * | Minor cleanupHarald Musum2017-12-204-11/+6
* | | Merge pull request #4498 from vespa-engine/balder/revert-back-to-using-a-prim...Henning Baldersheim2017-12-192-6/+2
|\ \ \
| * | | Use a prime based hash instead.Henning Baldersheim2017-12-192-6/+2
|/ / /
* | | Merge pull request #4496 from vespa-engine/revert-4489-hakonhall/prepare-for-...Harald Musum2017-12-199-236/+32
|\ \ \
| * | | Revert "Prepare for making node admin components optional"Harald Musum2017-12-199-236/+32
* | | | Merge pull request #4497 from vespa-engine/balder/protect-against-following-n...Henning Baldersheim2017-12-191-4/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Do not follow the nullptr.Henning Baldersheim2017-12-191-4/+8
|/ / /
* | | Merge pull request #4495 from vespa-engine/balder/use-2inN-hash-instead-of-pr...Henning Baldersheim2017-12-193-7/+17
|\ \ \ | |/ / |/| |
| * | Add fully parameterized instantiation macros.Henning Baldersheim2017-12-192-6/+15
| * | Use 2inN modulator instead of prime number modulator to avoid expensive divHenning Baldersheim2017-12-191-1/+2
|/ /
* | Merge pull request #4494 from vespa-engine/balder/inline-densetensor-addressc...Henning Baldersheim2017-12-192-59/+35
|\ \
| * | Inline DenseTensorAddressCombiner::combineHenning Baldersheim2017-12-192-59/+35
|/ /
* | Merge pull request #4493 from vespa-engine/balder/micro-optimize-densetensor-...Henning Baldersheim2017-12-191-7/+9
|\ \
| * | Avoid type conversion and also use a presized address scratchpadHenning Baldersheim2017-12-191-7/+9
|/ /
* | Merge pull request #4492 from vespa-engine/balder/inline-densetensorcellsiter...Henning Baldersheim2017-12-192-16/+12
|\ \
| * | DenseTensorCellsIterator::nextHenning Baldersheim2017-12-192-16/+12
|/ /
* | Merge pull request #4489 from vespa-engine/hakonhall/prepare-for-making-node-...Håkon Hallingstad2017-12-199-32/+236
|\ \
| * | Prepare for making node admin components optionalHåkon Hallingstad2017-12-199-32/+236
* | | Merge pull request #4487 from vespa-engine/balder/micro-optimize-dense-matrix...Geir Storli2017-12-1914-52/+46
|\ \ \