summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* multi-threaded transport for JRTHÃ¥vard Pettersen2019-05-1319-482/+604
* Merge pull request #9352 from vespa-engine/gjoranv/new-metrics-proxy_3gjoranv2019-05-1392-47/+6635
|\
| * Inline helper method.gjoranv2019-05-131-6/+1
| * Move amending of default consumer to Admin.gjoranv2019-05-133-19/+21
| * Allow adding metrics to the default consumer, for model amenders.gjoranv2019-05-108-24/+70
| * Remove 'healthport' from vespa-services config.gjoranv2019-05-104-5/+2
| * Exclude http-utils and apache httpclient.gjoranv2019-05-101-0/+11
| * Use string constant from metrics-proxy to avoid duplication.gjoranv2019-05-101-1/+2
| * New metrics-proxygjoranv2019-05-1089-40/+6576
* | Merge pull request #9374 from vespa-engine/jvenstad/more-deployment/fixesValerij Fredriksen2019-05-134-8/+9
|\ \
| * | Name field the same as the property, so it can be set using the same name in ...Jon Marius Venstad2019-05-132-4/+4
| * | Strip "vaas-" from region names for jobs >_<Jon Marius Venstad2019-05-131-1/+1
| * | Avoid NPE when serialising direct deploymentsJon Marius Venstad2019-05-131-3/+4
* | | Merge pull request #9341 from vespa-engine/vekterli/add-distributor-btree-buc...Tor Brede Vekterli2019-05-1319-180/+670
|\ \ \
| * | | Add initial B+tree distributor bucket databaseTor Brede Vekterli2019-05-0919-180/+670
* | | | Merge pull request #9373 from vespa-engine/revert-9369-revert-9366-revert-935...Harald Musum2019-05-1311-101/+37
|\ \ \ \
| * | | | Revert "Revert 9366 revert 9351 jvenstad/last config model fix commits"Jon Marius Venstad2019-05-1311-101/+37
|/ / / /
* | | | Merge pull request #9372 from vespa-engine/revert-9370-jvenstad/throw-on-ille...Jon Marius Venstad2019-05-131-1/+1
|\ \ \ \
| * | | | Revert "Throw IllegalStateException when activating (without prepare) for non...Jon Marius Venstad2019-05-131-1/+1
|/ / / /
* | | | Merge pull request #9365 from vespa-engine/freva/provision-to-application-idValerij Fredriksen2019-05-133-9/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | App ApplicationId to HostProvisionerValerij Fredriksen2019-05-103-9/+11
* | | | Merge pull request #9370 from vespa-engine/jvenstad/throw-on-illegal-activationHarald Musum2019-05-121-1/+1
|\ \ \ \
| * | | | Throw IllegalStateException when activating (without prepare) for non-existen...Jon Marius Venstad2019-05-121-1/+1
|/ / / /
* | | | Merge pull request #9369 from vespa-engine/revert-9366-revert-9351-jvenstad/l...Jon Marius Venstad2019-05-1211-37/+101
|\ \ \ \
| * | | | Resterende broken string :pJon Marius Venstad2019-05-121-1/+1
| * | | | Only abort redeploymebtsJon Marius Venstad2019-05-121-1/+4
| * | | | Revert "Revert "Jvenstad/last config model fix commits ""Jon Marius Venstad2019-05-1211-37/+98
|/ / / /
* | | | Merge pull request #9326 from vespa-engine/balder/use-2-transport-threads-for...Henning Baldersheim2019-05-121-53/+34
|\ \ \ \
| * \ \ \ Merge branch 'master' into balder/use-2-transport-threads-for-proton-rpcHenning Baldersheim2019-05-11330-9214/+3868
| |\ \ \ \
| * | | | | Unify on emplace_back and code style.Henning Baldersheim2019-05-081-51/+32
| * | | | | Use 2 thransport threads for proton rpc.Henning Baldersheim2019-05-082-2/+8
* | | | | | Merge pull request #9368 from vespa-engine/balder/ensure-threads-are-stoppedHenning Baldersheim2019-05-122-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Stop threadsHenning Baldersheim2019-05-112-0/+2
|/ / / / /
* | | | | Merge pull request #9360 from vespa-engine/balder/supervisor-has-only-1-roleHenning Baldersheim2019-05-1172-680/+561
|\ \ \ \ \
| * | | | | Follow api changeHenning Baldersheim2019-05-112-8/+8
| * | | | | Take full control over the supervisorHenning Baldersheim2019-05-112-4/+12
| * | | | | Clean up and shut down in correct order.Henning Baldersheim2019-05-111-13/+8
| * | | | | Listen after setup is complete.Henning Baldersheim2019-05-101-1/+1
| * | | | | Wait on the transport directly.Henning Baldersheim2019-05-105-10/+3
| * | | | | Simplify by not caching a memberHenning Baldersheim2019-05-101-10/+5
| * | | | | Simplify by not caching a memberHenning Baldersheim2019-05-101-10/+5
| * | | | | Simplify by not caching a memberHenning Baldersheim2019-05-101-8/+3
| * | | | | Simplify by not caching a memberHenning Baldersheim2019-05-101-10/+5
| * | | | | Simplify the supervisor responsibilityHenning Baldersheim2019-05-1072-660/+565
* | | | | | Merge pull request #9366 from vespa-engine/revert-9351-jvenstad/last-config-m...Harald Musum2019-05-1111-98/+37
|\ \ \ \ \ \
| * | | | | | Revert "Jvenstad/last config model fix commits "Jon Marius Venstad2019-05-1111-98/+37
|/ / / / / /
* | | | | | Merge pull request #9267 from vespa-engine/balder/honour-jvm-elementHenning Baldersheim2019-05-114-74/+128
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into balder/honour-jvm-elementHenning Baldersheim2019-05-11524-12118/+8414
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #9350 from vespa-engine/geirst/metrics-rewrite-tests-to-gt...Henning Baldersheim2019-05-104-330/+243
|\ \ \ \ \ \ \
| * | | | | | | Rewrite remaining metrics tests from cppunit to gtest.Geir Storli2019-05-104-330/+243
| | |_|_|_|_|/ | |/| | | | |