summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Bratseth/generate rank profiles for all models part 10 2"Jon Bratseth2018-08-3017-8442/+283
* Merge pull request #6736 from vespa-engine/toregge/use-proper-variant-of-attr...Henning Baldersheim2018-08-302-5/+11
|\
| * Make AttributeNode::IntegerHandler a templated class.Tor Egge2018-08-302-5/+11
* | Merge pull request #6723 from vespa-engine/havardpe/crypto-in-jrtHåvard Pettersen2018-08-3010-66/+449
|\ \
| * | also test with xor crypto engineHåvard Pettersen2018-08-302-4/+25
| * | Perform post-handshake drain after setting connection stateHåvard Pettersen2018-08-301-1/+1
| * | handshake data flushing should be handled by crypto socket handshakeHåvard Pettersen2018-08-291-5/+0
| * | integrate crypto concepts into jrtHåvard Pettersen2018-08-298-62/+429
* | | Merge pull request #6686 from vespa-engine/havardpe/integrate-crypto-engine-i...Håvard Pettersen2018-08-306-58/+185
|\ \ \
| * | | drain input pipeline after crypto handshakeHåvard Pettersen2018-08-301-1/+13
| * | | fixes based on feedbackHåvard Pettersen2018-08-282-2/+2
| * | | make sure we flush even if no new data needs writingHåvard Pettersen2018-08-271-1/+4
| * | | integrate Crypto{Engine,Socket} into fnetHåvard Pettersen2018-08-276-58/+170
* | | | Merge pull request #6725 from vespa-engine/freva/fix-node-adminValerij Fredriksen2018-08-3029-508/+273
|\ \ \ \
| * | | | Fix ZPE TODOValerij Fredriksen2018-08-302-9/+25
| * | | | Remove runContainersInPrivileged config optionValerij Fredriksen2018-08-304-6/+5
| * | | | Improve test performanceValerij Fredriksen2018-08-302-18/+18
| * | | | Simplify synchronizeNodesToNodeAgents()Valerij Fredriksen2018-08-302-108/+45
| * | | | Remove method from interface, only used in testsValerij Fredriksen2018-08-308-15/+8
| * | | | Remove unused classValerij Fredriksen2018-08-291-32/+0
| * | | | Convert to InetAddress without checked exceptionValerij Fredriksen2018-08-294-104/+92
| * | | | Use getAllContainersManagedBy() instead of listAllContainersManagedBy()Valerij Fredriksen2018-08-296-36/+13
| * | | | Do not NodeSpec to start/remove containerValerij Fredriksen2018-08-294-59/+46
| * | | | Remove InetAddressResolver, always use IPAddressesValerij Fredriksen2018-08-298-62/+38
| * | | | Split hostname into twoValerij Fredriksen2018-08-292-2/+7
| * | | | Remove getGlobalIPv6Address(ContainerName)Valerij Fredriksen2018-08-293-16/+0
| * | | | Remove option to set docker registry credentials supplierValerij Fredriksen2018-08-295-66/+1
* | | | | Merge pull request #6735 from vespa-engine/bratseth/add-model-evaluation-comp...Lester Solbakken2018-08-302-1/+5
|\ \ \ \ \
| * | | | | Add bundleJon Bratseth2018-08-302-1/+5
* | | | | | Merge pull request #6728 from vespa-engine/bratseth/initially-down-take-2Jon Bratseth2018-08-309-106/+179
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert to previous VIP status management from dispatchJon Bratseth2018-08-302-5/+9
| * | | | | Revert "Merge pull request #6726 from vespa-engine/revert-6719-bratseth/initi...Jon Bratseth2018-08-309-109/+178
* | | | | | Merge pull request #6732 from vespa-engine/bratseth/generate-rank-profiles-fo...Lester Solbakken2018-08-3017-283/+8442
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Test reading stored global modelsJon Bratseth2018-08-307-13/+8111
| * | | | | Revert "Merge pull request #6722 from vespa-engine/revert-6713-bratseth/gener...Jon Bratseth2018-08-2913-274/+335
| | |/ / / | |/| | |
* | | | | Merge pull request #6731 from vespa-engine/toregge/minor-attributenode-refact...Henning Baldersheim2018-08-308-110/+160
|\ \ \ \ \
| * | | | | Eliminate temporary raw pointer.Tor Egge2018-08-301-1/+1
| * | | | | Hide declaration of private handlers.Tor Egge2018-08-302-57/+67
| * | | | | Split out AttributeResult and EnumAttributeResult to separate files.Tor Egge2018-08-307-58/+98
* | | | | | Merge pull request #6730 from vespa-engine/mpolden/reduce-test-lock-timeoutJon Marius Venstad2018-08-302-5/+11
|\ \ \ \ \ \
| * | | | | | Reduce lock timeout in MockCuratorDbMartin Polden2018-08-302-5/+11
| |/ / / / /
* | | | | | Merge pull request #6727 from vespa-engine/musum/declare-optionArne H Juul2018-08-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Declare option for legacy formatHarald Musum2018-08-301-1/+1
* | | | | | Merge pull request #6721 from vespa-engine/balder/improve-error-messageHenning Baldersheim2018-08-302-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Improve error messageHenning Baldersheim2018-08-292-3/+3
* | | | | | Merge pull request #6706 from vespa-engine/bratseth/model-evaluator-api-impro...Lester Solbakken2018-08-303-3/+10
|\ \ \ \ \ \
| * | | | | | Improve JavadocJon Bratseth2018-08-281-0/+2
| * | | | | | API improvementsJon Bratseth2018-08-282-3/+8
* | | | | | | Merge pull request #6726 from vespa-engine/revert-6719-bratseth/initially-downJon Bratseth2018-08-309-178/+109
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Revert "Be down initially"Jon Bratseth2018-08-309-178/+109
|/ / / / / /