summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename 'vespa-security-env' -> 'vespa-security-env'Bjørn Christian Seime2019-05-284-4/+4
* Add 'security-tools' with 'vespa-tls-env' command line toolBjørn Christian Seime2019-05-288-0/+160
* Merge pull request #9566 from vespa-engine/toregge/specify-what-to-unpack-for...Geir Storli2019-05-281-1/+2
|\
| * Trim down what to unpack for bm25 feature.Tor Egge2019-05-271-1/+2
* | Merge pull request #9567 from vespa-engine/havardpe/improve-default-crypto-en...Geir Storli2019-05-282-16/+11
|\ \
| * | use proper singleton for default crypto engineHåvard Pettersen2019-05-272-16/+11
* | | Merge pull request #9583 from vespa-engine/aressem/fix-transparent-hugepage-s...Henning Baldersheim2019-05-281-2/+9
|\ \ \
| * | | Directory for transparent hugepage kernel setting has changed between RHEL 6 ...Arnstein Ressem2019-05-281-2/+9
|/ / /
* | | Merge pull request #9578 from vespa-engine/hmusum/ignore-deployment-xml-in-un...Harald Musum2019-05-287-11/+39
|\ \ \
| * | | Remove commentHarald Musum2019-05-281-1/+0
| * | | Fix testsHarald Musum2019-05-271-2/+4
| * | | Ignore deployment.xml in some contexts (e.g. unit tests)Harald Musum2019-05-276-9/+36
| | |/ | |/|
* | | Merge pull request #9579 from vespa-engine/hmusum/include-zkctl-jarArnstein Ressem2019-05-281-0/+1
|\ \ \
| * | | Include zkctl jar as wellHarald Musum2019-05-281-0/+1
|/ / /
* | | Merge pull request #9575 from vespa-engine/balder/30s-timeoutJon Bratseth2019-05-281-37/+20
|\ \ \
| * | | Extend timeout to 30s and cleanup/consolidate unused codeHenning Baldersheim2019-05-271-37/+20
* | | | Merge pull request #9576 from vespa-engine/freva/add-job-typesValerij Fredriksen2019-05-271-5/+10
|\ \ \ \
| * | | | Add PublicCd aws-us-east-1c prod, test and staging to JobTypeValerij Fredriksen2019-05-271-5/+10
* | | | | Merge pull request #9573 from vespa-engine/hmusum/validation-override-for-acc...Valerij Fredriksen2019-05-274-7/+29
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add validation override for access controlHarald Musum2019-05-274-7/+29
| | |/ / | |/| |
* | | | Merge pull request #9571 from vespa-engine/vekterli/move-datastore-and-btree-...Henning Baldersheim2019-05-27202-390/+401
|\ \ \ \
| * | | | Update executable name to match new test locationTor Brede Vekterli2019-05-271-3/+3
| * | | | Move datastore and btree code from searchlib to vespalibTor Brede Vekterli2019-05-27202-387/+398
* | | | | Merge pull request #9572 from vespa-engine/balder/limit-fusion-to-half-of-ava...Henning Baldersheim2019-05-271-1/+6
|\ \ \ \ \
| * | | | | Use a sempahore and limit number of resources to 50%Henning Baldersheim2019-05-271-1/+6
| |/ / / /
* | | | | Merge pull request #9574 from vespa-engine/balder/reduce-length-of-testHenning Baldersheim2019-05-271-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reduce the length/cost of the test.Henning Baldersheim2019-05-271-3/+3
|/ / / /
* | | | Merge pull request #9568 from vespa-engine/geirst/storageframework-rewrite-te...Geir Storli2019-05-279-166/+49
|\ \ \ \ | |/ / / |/| | |
| * | | Use ASSERT_TRUE() where appropriate.Geir Storli2019-05-271-1/+1
| * | | Rewrite storageframework tests from cppunit to gtest.Geir Storli2019-05-275-129/+49
| * | | Remove empty test.Geir Storli2019-05-275-37/+0
| |/ /
* | | Merge pull request #9565 from vespa-engine/freva/fix-vcpu-to-shares-ratioValerij Fredriksen2019-05-273-23/+72
|\ \ \ | |/ / |/| |
| * | Validate cpu shares better and scale by 32 for each minVcpuValerij Fredriksen2019-05-272-3/+52
| * | Propagate context to getContainerResources()Valerij Fredriksen2019-05-271-20/+20
* | | Merge pull request #9563 from vespa-engine/toregge/use-match-data-tagging-whe...Geir Storli2019-05-279-22/+46
|\ \ \
| * | | Fix copy constructor.Tor Egge2019-05-271-1/+1
| * | | Use match data tagging when constructing search iterator.Tor Egge2019-05-278-21/+45
* | | | Merge pull request #9549 from vespa-engine/jvenstad/zk-watcher-serialisationJon Marius Venstad2019-05-2726-145/+425
|\ \ \ \
| * | | | Shut down executor, and use shared executor for minor work tooJon Marius Venstad2019-05-242-8/+11
| * | | | Use the zkWatcherExecutor for all work initiated by watchers (from the zkCach...Jon Marius Venstad2019-05-2421-125/+157
| * | | | Add and expose a StripedExecutor from the TenantRepositoryJon Marius Venstad2019-05-244-5/+38
| * | | | Add InThreadExecutorService for test purposesJon Marius Venstad2019-05-241-0/+49
| * | | | Add StripedExecutor for serialising tasks per keyJon Marius Venstad2019-05-242-0/+150
| * | | | Run updateTenants in test to simulate watcher reactionJon Marius Venstad2019-05-242-1/+3
| * | | | Split tenant deletion and cleanup, intention and watcher reactionJon Marius Venstad2019-05-242-12/+25
| * | | | Use void signature for a delete methodJon Marius Venstad2019-05-241-3/+1
* | | | | Merge pull request #9531 from vespa-engine/jvenstad/config-super-model-last-takeJon Marius Venstad2019-05-2711-36/+103
|\ \ \ \ \
| * | | | | Split session validation to preserve behaviourJon Marius Venstad2019-05-241-2/+5
| * | | | | Revert "Revert "Throw IllegalStateException when activating (without prepare)...Jon Marius Venstad2019-05-241-1/+1
| * | | | | Revert "Revert "Revert 9366 revert 9351 jvenstad/last config model fix commits""Jon Marius Venstad2019-05-2411-37/+101
| |/ / / /