summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.178.22-1].vespa-6.178.22-1by-screwdriver2017-11-294-1/+2
* Merge pull request #4296 from vespa-engine/havardpe/use-binary-format-when-co...Arne H Juul2017-11-281-4/+7
|\
| * use binary format to convert tensorsHåvard Pettersen2017-11-281-4/+7
* | Merge pull request #4297 from vespa-engine/hmusum/rename-element-to-disable-f...Harald Musum2017-11-286-14/+13
|\ \
| * | Backwards compatibilityHarald Musum2017-11-281-1/+2
| * | Rename element to disable filedistributorHarald Musum2017-11-286-15/+13
| |/
* | Merge pull request #4295 from vespa-engine/havardpe/ignore-filesTor Brede Vekterli2017-11-281-0/+2
|\ \ | |/ |/|
| * ignore generated filesHåvard Pettersen2017-11-281-0/+2
|/
* Merge pull request #4290 from vespa-engine/freva/return-nan-first-timeHarald Musum2017-11-281-3/+3
|\
| * Return NaN the first time CPU util is calledValerij Fredriksen2017-11-281-3/+3
* | Merge pull request #4286 from vespa-engine/hmusum/more-wiring-for-disabling-f...Henning Baldersheim2017-11-287-10/+39
|\ \
| * | More wiring for making it possible to disable filedistributorHarald Musum2017-11-277-10/+39
* | | Merge pull request #4289 from vespa-engine/hmusum/write-to-temp-file-and-moveHenning Baldersheim2017-11-281-2/+5
|\ \ \
| * | | Write to temp file and move it afterwardsHarald Musum2017-11-281-2/+5
* | | | Merge pull request #4288 from vespa-engine/hmusum/make-tenants-handling-more-...Henning Baldersheim2017-11-283-12/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Do not create system tenants in constructor. Do not put into map of tenants u...Harald Musum2017-11-273-12/+14
| |/ /
* | | Merge pull request #4287 from vespa-engine/freva/add-https-bindingsMorten Tokle2017-11-282-1/+34
|\ \ \ | |/ / |/| |
| * | Add HTTPS bindings in configserver-app services.xmlValerij Fredriksen2017-11-272-1/+34
* | | Merge pull request #4272 from vespa-engine/toregge/use-standard-locking-in-st...Geir Storli2017-11-2713-75/+94
|\ \ \
| * | | Use standard locking in BucketOperationLogger.Tor Egge2017-11-243-6/+7
| * | | Use standard locking in StorageLinkQueued.Tor Egge2017-11-242-12/+20
| * | | Remove unused code from StorageLinkQueued.Tor Egge2017-11-242-13/+0
| * | | Use standard locking in StorageComponent.Tor Egge2017-11-242-10/+10
| * | | Use standard locking in BucketManager.Tor Egge2017-11-242-21/+24
| * | | Use standard locking in StorageBucketDBInitializer.Tor Egge2017-11-244-13/+33
* | | | Merge pull request #4285 from vespa-engine/hmusum/use-FileChannel-for-file-co...Henning Baldersheim2017-11-272-20/+28
|\ \ \ \
| * | | | Copy files correctlyHarald Musum2017-11-272-20/+28
| | |_|/ | |/| |
* | | | Merge pull request #4281 from vespa-engine/gjoranv/ban-compile-depsgjoranv2017-11-271-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Ban all compile scope deps.gjoranv2017-11-251-1/+2
| |/ /
* | | Merge pull request #4282 from vespa-engine/hmusum/fix-start-filedistribution-...Henning Baldersheim2017-11-271-1/+1
|\ \ \ | |_|/ |/| |
| * | Make sure file distributor is started when disable_filedistributor is unsetHarald Musum2017-11-271-1/+1
* | | Merge pull request #4277 from vespa-engine/freva/docker-container-kernel-usageValerij Fredriksen2017-11-274-19/+43
|\ \ \ | |/ / |/| |
| * | Rearrange calculations, fix comments. No functional changesValerij Fredriksen2017-11-271-12/+13
| * | Export cpu.sys.util metricValerij Fredriksen2017-11-241-0/+2
| * | Add metric for kernel cpu usage in docker containerValerij Fredriksen2017-11-243-16/+37
* | | Merge pull request #4267 from vespa-engine/mortent/validate-identityBjørn Christian Seime2017-11-275-8/+101
|\ \ \
| * | | Validate athenz-domain in deployment.xml equal to tenant domainMorten Tokle2017-11-245-8/+101
* | | | Merge pull request #4280 from vespa-engine/hmusum/add-setting-for-disabling-f...Henning Baldersheim2017-11-2717-33/+176
|\ \ \ \
| * | | | Add setting for turning off file distributorHarald Musum2017-11-2717-33/+176
* | | | | Merge pull request #4279 from vespa-engine/hmusum/copy-file-correctlyHenning Baldersheim2017-11-271-1/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Copy file in a way that preserves the contentHarald Musum2017-11-251-1/+21
|/ / / /
* | | | Merge pull request #4276 from vespa-engine/hmusum/remove-duplicate-dependencyBjørn Christian Seime2017-11-241-5/+0
|\ \ \ \
| * | | | Remove duplicate dependencyHarald Musum2017-11-241-5/+0
| | |_|/ | |/| |
* | | | Merge pull request #4274 from vespa-engine/mpolden/fix-testMartin Polden2017-11-2418-84/+549
|\ \ \ \
| * | | | Fix and unignore testMartin Polden2017-11-2418-84/+549
* | | | | Merge pull request #4275 from vespa-engine/revert-4257-balder/fix-logic-flaw-...Harald Musum2017-11-2418-73/+522
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Balder/fix logic flaw causing missing config changes"Harald Musum2017-11-2418-73/+522
|/ / / /
* | | | Merge pull request #4256 from vespa-engine/toregge/use-standard-locking-in-lo...Henning Baldersheim2017-11-242-52/+55
|\ \ \ \
| * | | | Use standard locking in LockableMap.Tor Egge2017-11-232-52/+55
| | |_|/ | |/| |
* | | | Merge pull request #4257 from vespa-engine/balder/fix-logic-flaw-causing-miss...Henning Baldersheim2017-11-2418-522/+73
|\ \ \ \