summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move commentHarald Musum2019-08-271-1/+1
|
* Revert "Exclusion needed to get a working config server"Harald Musum2019-08-271-9/+0
| | | | This reverts commit 7d612f773d4b1ed41a1c6c4a32662cff6fde39d3.
* Exclusion needed to get a working config serverHarald Musum2019-08-271-0/+9
|
* Merge branch 'master' into ↵Harald Musum2019-08-2651-207/+379
|\ | | | | | | revert-10388-revert-10370-revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14
| * Merge pull request #10415 from vespa-engine/bjorncs/vespa-opensslBjørn Christian Seime2019-08-261-2/+2
| |\ | | | | | | Use devel package as build dep
| | * Use devel package as build depBjørn Christian Seime2019-08-261-2/+2
| | |
| * | Merge pull request #10406 from vespa-engine/hmusum/fix-dependenciesHarald Musum2019-08-262-11/+48
| |\ \ | | | | | | | | Stop depending on container-test
| | * | Fixes after code reviewHarald Musum2019-08-262-10/+5
| | | |
| | * | Stop depending on container-testHarald Musum2019-08-261-8/+50
| | | |
| * | | Merge pull request #10393 from vespa-engine/bjorncs/security-utilsBjørn Christian Seime2019-08-263-19/+64
| |\ \ \ | | | | | | | | | | Bjorncs/security utils
| | * | | Refactor private key serialization testsBjørn Christian Seime2019-08-231-28/+14
| | | | |
| | * | | Allow output of PEM private keys using PKCS#8Bjørn Christian Seime2019-08-233-7/+66
| | | | |
| * | | | Merge pull request #10401 from vespa-engine/balder/avoid-sync-on-shared-executorHenning Baldersheim2019-08-2627-86/+107
| |\ \ \ \ | | |_|_|/ | |/| | | Balder/avoid sync on shared executor
| | * | | _inFlight -> _numChunksPostedHenning Baldersheim2019-08-262-18/+18
| | | | |
| | * | | Do not require or provide Syncable.Henning Baldersheim2019-08-2512-16/+15
| | | | |
| | * | | Split ThreadExecutor in syncable and not.Henning Baldersheim2019-08-2535-74/+80
| | | | |
| | * | | Make it compileHenning Baldersheim2019-08-252-5/+5
| | | | |
| | * | | Use explicit sync, as sync on shared executor is not very wise.Henning Baldersheim2019-08-252-7/+28
| | | | |
| | * | | Nested namespaceHenning Baldersheim2019-08-251-5/+2
| | | | |
| | * | | Nested namespaceHenning Baldersheim2019-08-251-3/+1
| | | | |
| * | | | Merge pull request #10409 from vespa-engine/bratseth/and-phrasesJon Bratseth2019-08-2618-90/+158
| |\ \ \ \ | | | | | | | | | | | | Bratseth/and phrases
| | * | | | Allow segment and in phraseJon Bratseth2019-08-262-12/+27
| | | | | |
| | * | | | Test implicit and optionJon Bratseth2019-08-263-3/+39
| | | | | |
| | * | | | Support index-command phrase-segmentingJon Bratseth2019-08-2616-82/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set connectivity to max between items in implicit phrases (always) - Allow indexes to choose to represent implicit phrases by and in legacy parsers by adding index-command: phrase-segmenting false
| * | | | | Merge pull request #10413 from vespa-engine/bjorncs/vespa-opensslArnstein Ressem2019-08-261-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Add openssl as Vespa requirement
| | * | | | | Add openssl as Vespa requirementBjørn Christian Seime2019-08-261-0/+1
| |/ / / / /
* | | | | | Revert "Revert "Depend on zkfacade for tests""Harald Musum2019-08-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2cd3a22cdc98429dc12c09c6b196eeebadc8e08c.
* | | | | | Revert "Depend on zkfacade for tests"Harald Musum2019-08-261-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cc62fbbbc5984e14ee38774c3600dcf612bd5a0.
* | | | | | Merge branch 'master' into ↵Harald Musum2019-08-2645-370/+681
|\| | | | | | | | | | | | | | | | | | | | | | | revert-10388-revert-10370-revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14
| * | | | | Merge pull request #10408 from vespa-engine/jvenstad/never-hide-dev=jobsTorbjørn Smørgrav2019-08-262-3/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | | Don't hide dev jobs just because there isn't (yet) a dev deployment
| | * | | | Update test response even moreJon Marius Venstad2019-08-261-1/+1
| | | | | |
| | * | | | Update test responseJon Marius Venstad2019-08-261-1/+22
| | | | | |
| | * | | | Don't hide dev jobs just because there isn't (yet) a dev deploymentJon Marius Venstad2019-08-261-2/+1
| | | | | |
| * | | | | Merge pull request #10407 from ↵Martin Polden2019-08-265-23/+150
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | vespa-engine/mpolden/handle-multiple-rotations-in-api Include status of all rotations in application API
| | * | | | Include status of all rotations in application APIMartin Polden2019-08-265-23/+150
| | | | | |
| * | | | | Merge pull request #10403 from vespa-engine/hakonhall/locate-mvn-from-pathJon Marius Venstad2019-08-261-4/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Locate mvn from PATH
| | * | | | | Locate mvn from PATHHåkon Hallingstad2019-08-261-4/+1
| | | | | | |
| * | | | | | Merge pull request #10405 from vespa-engine/bratseth/add-not-to-notJon Bratseth2019-08-264-20/+56
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Supoprt and'ing two not's
| | * | | | | | Supoprt and'ing two not'sJon Bratseth2019-08-264-20/+56
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #10394 from vespa-engine/andreer/separate-store-for-app-certsAndreas Eriksen2019-08-267-56/+54
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | andreer/separate-store-for-app-certs
| | * | | | | separate zk path for application certificatesandreer2019-08-237-56/+54
| | | | | | |
| * | | | | | Merge pull request #10398 from ↵Geir Storli2019-08-2610-56/+58
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/add-workaround-for-aligned-entry-ref Rename UniqueStoreSaver to UniqueStoreEnumerator.
| | * | | | | | Fix class comment.Tor Egge2019-08-231-1/+1
| | | | | | | |
| | * | | | | | Rename UniqueStoreSaver => UniqueStoreEnumerator.Tor Egge2019-08-238-46/+45
| | | | | | | |
| | * | | | | | Trim down include.Tor Egge2019-08-231-1/+1
| | | | | | | |
| | * | | | | | Add workaround for use of deprecated AlignedEntryRefT.Tor Egge2019-08-234-8/+11
| | | | | | | |
| * | | | | | | Merge pull request #10397 from ↵Geir Storli2019-08-265-82/+80
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/rewrite-enum-store-dictionary-2 Geirst/rewrite enum store dictionary 2.
| | * | | | | | Change EnumStoreDictBase to inherit UniqueStoreDictionaryBase to use more ↵Geir Storli2019-08-235-60/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions directly from that API.
| | * | | | | | Change typedef -> using.Geir Storli2019-08-231-22/+24
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #10389 from vespa-engine/mpolden/rotation-status-updaterMartin Polden2019-08-2614-131/+264
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | Retrieve rotation status from GlobalRoutingService