Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove some java OSS stuff too. | Henning Baldersheim | 2017-10-17 | 7 | -650/+1 |
| | |||||
* | Remove OSS from c++ | Henning Baldersheim | 2017-10-17 | 28 | -1053/+64 |
| | |||||
* | Serverpool in ZK (#3764) | Valerij Fredriksen | 2017-10-17 | 1 | -3/+35 |
| | | | | | | * Serverpool in ZK * Change timeouts | ||||
* | Merge pull request #3770 from vespa-engine/balder/remove-ooscli | Arne H Juul | 2017-10-17 | 5 | -122/+20 |
|\ | | | | | Remove functionality from pre SPI era. | ||||
| * | Remove functionality from pre SPI era. | Henning Baldersheim | 2017-10-16 | 5 | -122/+20 |
| | | |||||
* | | Merge pull request #3772 from vespa-engine/bjorncs/athenz-migration | Jon Bratseth | 2017-10-17 | 1 | -1/+1 |
|\ \ | | | | | | | Method should be PUT, not POST | ||||
| * | | Method should be PUT, not POST | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3776 from vespa-engine/bjorncs/fix | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix typo | ||||
| * | | | Fix typo | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3775 from vespa-engine/bjorncs/athenz-fixes | Morten Tokle | 2017-10-16 | 4 | -10/+10 |
|\ \ \ | | | | | | | | | Bjorncs/athenz fixes | ||||
| * | | | Rename getName -> getNameSuffix | Bjørn Christian Seime | 2017-10-16 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | getName was misleading and could be confused with the fully qualified name of the domain. | ||||
| * | | | Use correct Athenz domain identifier | Bjørn Christian Seime | 2017-10-16 | 2 | -8/+8 |
|/ / / | |||||
* | | | Merge pull request #3773 from vespa-engine/geirst/cleanup-proton-config-def | Henning Baldersheim | 2017-10-16 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | Remove background.threads from proton.def, replaced by feeding.concur… | ||||
| * | | | Remove background.threads from proton.def, replaced by feeding.concurrency. | Geir Storli | 2017-10-16 | 1 | -6/+1 |
| |/ / | |||||
* | | | Merge pull request #3774 from vespa-engine/bjorncs/athenz | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | Make ZmsKeystoreImpl constructor public | ||||
| * | | Make ZmsKeystoreImpl constructor public | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #3771 from ↵ | Henning Baldersheim | 2017-10-16 | 6 | -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 Storli | 2017-10-16 | 6 | -61/+1 |
| | | | | | | | | | | | | feeding.concurrency. | ||||
| * | | Add tuning of proton feeding concurrency. | Geir Storli | 2017-10-16 | 4 | -0/+36 |
|/ / | |||||
* | | Merge pull request #3762 from vespa-engine/balder/remove-explicit-ack | Henning Baldersheim | 2017-10-16 | 32 | -714/+412 |
|\ \ | |/ |/| | Balder/remove explicit ack | ||||
| * | Update tests with expected trace order. Also remove unused imports and ↵ | Henning Baldersheim | 2017-10-16 | 1 | -33/+24 |
| | | | | | | | | follow clion advise. | ||||
| * | remove unused imports | Henning Baldersheim | 2017-10-16 | 1 | -9/+0 |
| | | |||||
| * | remove unused imports | Henning Baldersheim | 2017-10-16 | 1 | -10/+0 |
| | | |||||
| * | remove unused code and follow clion advice | Henning Baldersheim | 2017-10-16 | 1 | -31/+13 |
| | | |||||
| * | Use shared ptr and Idesructorcallback to make it more flexible. | Henning Baldersheim | 2017-10-15 | 13 | -169/+84 |
| | | |||||
| * | Reformat. | Henning Baldersheim | 2017-10-14 | 1 | -17/+8 |
| | | |||||
| * | Need to give away your own token. If not you will not get an answer. | Henning Baldersheim | 2017-10-14 | 1 | -11/+11 |
| | | |||||
| * | Remove explicit ack and use feedtoken as a smartptr | Henning Baldersheim | 2017-10-13 | 27 | -457/+295 |
| | | |||||
* | | Merge pull request #3765 from ↵ | Tor Brede Vekterli | 2017-10-16 | 9 | -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 Egge | 2017-10-16 | 9 | -65/+87 |
| | | | |||||
* | | | Merge pull request #3769 from vespa-engine/mpolden/fix-block-upgrade | Jon Bratseth | 2017-10-16 | 4 | -6/+10 |
|\ \ \ | | | | | | | | | Let block-upgrade continue to work | ||||
| * | | | Let block-upgrade continue to work | Martin Polden | 2017-10-16 | 4 | -6/+10 |
| | | | | |||||
* | | | | Merge pull request #3767 from vespa-engine/gjoranv/use-jar-packaging | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use packaging 'jar' | ||||
| * | | | | Use packaging 'jar' | gjoranv | 2017-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | .. so that users don't have to explicitly declare dependency type. | ||||
* | | | | | Merge pull request #3768 from vespa-engine/bjorncs/athenz | Bjørn Christian Seime | 2017-10-16 | 1 | -12/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove duplicate 'repositories' element | ||||
| * | | | | Remove duplicate 'repositories' element | Bjørn Christian Seime | 2017-10-16 | 1 | -12/+0 |
|/ / / / | |||||
* | | | | Merge pull request #3766 from vespa-engine/bjorncs/athenz | Morten Tokle | 2017-10-16 | 54 | -493/+1473 |
|\ \ \ \ | | | | | | | | | | | Open-source Athenz integration for controller-server | ||||
| * | | | | Open-source Athenz integration for controller-server | Bjørn Christian Seime | 2017-10-16 | 54 | -493/+1473 |
|/ / / / | |||||
* | | | | Merge pull request #3760 from ↵ | Henning Baldersheim | 2017-10-16 | 2 | -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 Storli | 2017-10-16 | 2 | -0/+7 |
| |/ / | |||||
* | | | Merge pull request #3761 from vespa-engine/bjorncs/try-add-athenz-deps | Morten Tokle | 2017-10-16 | 1 | -0/+22 |
|\ \ \ | |/ / |/| | | Add Athenz dependencies to parent pom.xml | ||||
| * | | Add Athenz dependencies to parent pom.xml | Bjørn Christian Seime | 2017-10-16 | 1 | -0/+22 |
|/ / | |||||
* | | Merge pull request #3747 from ↵ | Tor Brede Vekterli | 2017-10-16 | 13 | -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 using | Tor Egge | 2017-10-13 | 4 | -45/+36 |
| | | | | | | | | | | | | bucket space information from storage commands. | ||||
| * | | Adjust API for storage messages: Replace virtual getBucketId() method with | Tor Egge | 2017-10-13 | 10 | -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-source | Bjørn Christian Seime | 2017-10-16 | 54 | -1483/+493 |
|\ \ \ | | | | | | | | | Revert "Open-source Athenz integration for controller-server" | ||||
| * | | | Revert "Open-source Athenz integration for controller-server" | Bjørn Christian Seime | 2017-10-16 | 54 | -1483/+493 |
|/ / / | | | | | | | | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c. | ||||
* | | | Merge pull request #3757 from vespa-engine/gjoranv/use-application-for-now | gjoranv | 2017-10-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use application until container-test is available. | ||||
| * | | | Use application until container-test is available. | gjoranv | 2017-10-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3756 from vespa-engine/bjorncs/screwdriver | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use maven-dependency-plugin 2.10 |