summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3776 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-10-161-1/+1
|\ | | | | Fix typo
| * Fix typoBjørn Christian Seime2017-10-161-1/+1
|/
* Merge pull request #3775 from vespa-engine/bjorncs/athenz-fixesMorten Tokle2017-10-164-10/+10
|\ | | | | Bjorncs/athenz fixes
| * Rename getName -> getNameSuffixBjørn Christian Seime2017-10-162-2/+2
| | | | | | | | | | getName was misleading and could be confused with the fully qualified name of the domain.
| * Use correct Athenz domain identifierBjørn Christian Seime2017-10-162-8/+8
|/
* Merge pull request #3773 from vespa-engine/geirst/cleanup-proton-config-defHenning Baldersheim2017-10-161-6/+1
|\ | | | | Remove background.threads from proton.def, replaced by feeding.concur…
| * Remove background.threads from proton.def, replaced by feeding.concurrency.Geir Storli2017-10-161-6/+1
| |
* | Merge pull request #3774 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-161-1/+3
|\ \ | |/ |/| Make ZmsKeystoreImpl constructor public
| * Make ZmsKeystoreImpl constructor publicBjørn Christian Seime2017-10-161-1/+3
|/
* Merge pull request #3771 from ↵Henning Baldersheim2017-10-166-45/+21
|\ | | | | | | | | vespa-engine/geirst/add-tuning-of-proton-feeding-concurrency Geirst/add tuning of proton feeding concurrency
| * Remove tuning of proton background.threads, as it is replaced by ↵Geir Storli2017-10-166-61/+1
| | | | | | | | feeding.concurrency.
| * Add tuning of proton feeding concurrency.Geir Storli2017-10-164-0/+36
|/
* Merge pull request #3762 from vespa-engine/balder/remove-explicit-ackHenning Baldersheim2017-10-1632-714/+412
|\ | | | | Balder/remove explicit ack
| * Update tests with expected trace order. Also remove unused imports and ↵Henning Baldersheim2017-10-161-33/+24
| | | | | | | | follow clion advise.
| * remove unused importsHenning Baldersheim2017-10-161-9/+0
| |
| * remove unused importsHenning Baldersheim2017-10-161-10/+0
| |
| * remove unused code and follow clion adviceHenning Baldersheim2017-10-161-31/+13
| |
| * Use shared ptr and Idesructorcallback to make it more flexible.Henning Baldersheim2017-10-1513-169/+84
| |
| * Reformat.Henning Baldersheim2017-10-141-17/+8
| |
| * Need to give away your own token. If not you will not get an answer.Henning Baldersheim2017-10-141-11/+11
| |
| * Remove explicit ack and use feedtoken as a smartptrHenning Baldersheim2017-10-1327-457/+295
| |
* | Merge pull request #3765 from ↵Tor Brede Vekterli2017-10-169-65/+87
|\ \ | | | | | | | | | | | | vespa-engine/toregge/add-bucket-space-to-storage-commands-pass2 Add bucket space to more storage commands.
| * | Add bucket space to more storage commands.Tor Egge2017-10-169-65/+87
| | |
* | | Merge pull request #3769 from vespa-engine/mpolden/fix-block-upgradeJon Bratseth2017-10-164-6/+10
|\ \ \ | | | | | | | | Let block-upgrade continue to work
| * | | Let block-upgrade continue to workMartin Polden2017-10-164-6/+10
| | | |
* | | | Merge pull request #3767 from vespa-engine/gjoranv/use-jar-packagingBjørn Christian Seime2017-10-161-1/+1
|\ \ \ \ | | | | | | | | | | Use packaging 'jar'
| * | | | Use packaging 'jar'gjoranv2017-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | .. so that users don't have to explicitly declare dependency type.
* | | | | Merge pull request #3768 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-161-12/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove duplicate 'repositories' element
| * | | | Remove duplicate 'repositories' elementBjørn Christian Seime2017-10-161-12/+0
|/ / / /
* | | | Merge pull request #3766 from vespa-engine/bjorncs/athenzMorten Tokle2017-10-1654-493/+1473
|\ \ \ \ | | | | | | | | | | Open-source Athenz integration for controller-server
| * | | | Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1654-493/+1473
|/ / / /
* | | | Merge pull request #3760 from ↵Henning Baldersheim2017-10-162-0/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/geirst/set-cpu-cores-based-on-node-flavor Set num cpu cores in proton config based on node flavor.
| * | | Set num cpu cores in proton config based on node flavor.Geir Storli2017-10-162-0/+7
| |/ /
* | | Merge pull request #3761 from vespa-engine/bjorncs/try-add-athenz-depsMorten Tokle2017-10-161-0/+22
|\ \ \ | |/ / |/| | Add Athenz dependencies to parent pom.xml
| * | Add Athenz dependencies to parent pom.xmlBjørn Christian Seime2017-10-161-0/+22
|/ /
* | Merge pull request #3747 from ↵Tor Brede Vekterli2017-10-1613-92/+105
|\ \ | | | | | | | | | | | | vespa-engine/toregge/add-bucket-space-to-storage-commands Adjust API for storage messages: Replace virtual getBucketId() method…
| * | Reduce number of calls to document::BucketSpace::placeHolder() by usingTor Egge2017-10-134-45/+36
| | | | | | | | | | | | bucket space information from storage commands.
| * | Adjust API for storage messages: Replace virtual getBucketId() method withTor Egge2017-10-1310-47/+69
| | | | | | | | | | | | | | | | | | | | | virtual getBucket() method that also contains bucket space. Adjust BucketCommand/BucketReply intermediate storage message classes to use document::Bucket members instead of document::BucketId.
* | | Merge pull request #3758 from vespa-engine/bjorncs/revert-athenz-open-sourceBjørn Christian Seime2017-10-1654-1483/+493
|\ \ \ | | | | | | | | Revert "Open-source Athenz integration for controller-server"
| * | | Revert "Open-source Athenz integration for controller-server"Bjørn Christian Seime2017-10-1654-1483/+493
|/ / / | | | | | | | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c.
* | | Merge pull request #3757 from vespa-engine/gjoranv/use-application-for-nowgjoranv2017-10-161-1/+1
|\ \ \ | | | | | | | | Use application until container-test is available.
| * | | Use application until container-test is available.gjoranv2017-10-161-1/+1
|/ / /
* | | Merge pull request #3756 from vespa-engine/bjorncs/screwdriverBjørn Christian Seime2017-10-161-1/+1
|\ \ \ | | | | | | | | Use maven-dependency-plugin 2.10
| * | | Use maven-dependency-plugin 2.10Bjørn Christian Seime2017-10-161-1/+1
|/ / /
* | | Merge pull request #3750 from vespa-engine/gjoranv/container-testgjoranv2017-10-167-15/+141
|\ \ \ | | | | | | | | Gjoranv/container test
| * \ \ Merge branch 'master' into gjoranv/container-testgjoranv2017-10-16176-2296/+4732
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3754 from vespa-engine/bratseth/dont-validate-on-readMartin Polden2017-10-166-6/+49
|\ \ \ \ | | | | | | | | | | Bratseth/dont validate on read
| * | | | Don't validate when reading stored applicationsJon Bratseth2017-10-163-4/+30
| | | | |
| * | | | Nonfunctional changes onlyJon Bratseth2017-10-163-2/+19
| | | | |
* | | | | Merge pull request #3755 from vespa-engine/bjorncs/athenz-open-sourceBjørn Christian Seime2017-10-1654-493/+1485
|\ \ \ \ \ | | | | | | | | | | | | Open-source Athenz integration for controller-server