Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move comment | Harald Musum | 2019-08-27 | 1 | -1/+1 |
| | |||||
* | Revert "Exclusion needed to get a working config server" | Harald Musum | 2019-08-27 | 1 | -9/+0 |
| | | | | This reverts commit 7d612f773d4b1ed41a1c6c4a32662cff6fde39d3. | ||||
* | Exclusion needed to get a working config server | Harald Musum | 2019-08-27 | 1 | -0/+9 |
| | |||||
* | Merge branch 'master' into ↵ | Harald Musum | 2019-08-26 | 51 | -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-openssl | Bjørn Christian Seime | 2019-08-26 | 1 | -2/+2 |
| |\ | | | | | | | Use devel package as build dep | ||||
| | * | Use devel package as build dep | Bjørn Christian Seime | 2019-08-26 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #10406 from vespa-engine/hmusum/fix-dependencies | Harald Musum | 2019-08-26 | 2 | -11/+48 |
| |\ \ | | | | | | | | | Stop depending on container-test | ||||
| | * | | Fixes after code review | Harald Musum | 2019-08-26 | 2 | -10/+5 |
| | | | | |||||
| | * | | Stop depending on container-test | Harald Musum | 2019-08-26 | 1 | -8/+50 |
| | | | | |||||
| * | | | Merge pull request #10393 from vespa-engine/bjorncs/security-utils | Bjørn Christian Seime | 2019-08-26 | 3 | -19/+64 |
| |\ \ \ | | | | | | | | | | | Bjorncs/security utils | ||||
| | * | | | Refactor private key serialization tests | Bjørn Christian Seime | 2019-08-23 | 1 | -28/+14 |
| | | | | | |||||
| | * | | | Allow output of PEM private keys using PKCS#8 | Bjørn Christian Seime | 2019-08-23 | 3 | -7/+66 |
| | | | | | |||||
| * | | | | Merge pull request #10401 from vespa-engine/balder/avoid-sync-on-shared-executor | Henning Baldersheim | 2019-08-26 | 27 | -86/+107 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Balder/avoid sync on shared executor | ||||
| | * | | | _inFlight -> _numChunksPosted | Henning Baldersheim | 2019-08-26 | 2 | -18/+18 |
| | | | | | |||||
| | * | | | Do not require or provide Syncable. | Henning Baldersheim | 2019-08-25 | 12 | -16/+15 |
| | | | | | |||||
| | * | | | Split ThreadExecutor in syncable and not. | Henning Baldersheim | 2019-08-25 | 35 | -74/+80 |
| | | | | | |||||
| | * | | | Make it compile | Henning Baldersheim | 2019-08-25 | 2 | -5/+5 |
| | | | | | |||||
| | * | | | Use explicit sync, as sync on shared executor is not very wise. | Henning Baldersheim | 2019-08-25 | 2 | -7/+28 |
| | | | | | |||||
| | * | | | Nested namespace | Henning Baldersheim | 2019-08-25 | 1 | -5/+2 |
| | | | | | |||||
| | * | | | Nested namespace | Henning Baldersheim | 2019-08-25 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Merge pull request #10409 from vespa-engine/bratseth/and-phrases | Jon Bratseth | 2019-08-26 | 18 | -90/+158 |
| |\ \ \ \ | | | | | | | | | | | | | Bratseth/and phrases | ||||
| | * | | | | Allow segment and in phrase | Jon Bratseth | 2019-08-26 | 2 | -12/+27 |
| | | | | | | |||||
| | * | | | | Test implicit and option | Jon Bratseth | 2019-08-26 | 3 | -3/+39 |
| | | | | | | |||||
| | * | | | | Support index-command phrase-segmenting | Jon Bratseth | 2019-08-26 | 16 | -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-openssl | Arnstein Ressem | 2019-08-26 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add openssl as Vespa requirement | ||||
| | * | | | | | Add openssl as Vespa requirement | Bjørn Christian Seime | 2019-08-26 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Revert "Revert "Depend on zkfacade for tests"" | Harald Musum | 2019-08-26 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2cd3a22cdc98429dc12c09c6b196eeebadc8e08c. | ||||
* | | | | | | Revert "Depend on zkfacade for tests" | Harald Musum | 2019-08-26 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cc62fbbbc5984e14ee38774c3600dcf612bd5a0. | ||||
* | | | | | | Merge branch 'master' into ↵ | Harald Musum | 2019-08-26 | 45 | -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=jobs | Torbjørn Smørgrav | 2019-08-26 | 2 | -3/+23 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Don't hide dev jobs just because there isn't (yet) a dev deployment | ||||
| | * | | | | Update test response even more | Jon Marius Venstad | 2019-08-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update test response | Jon Marius Venstad | 2019-08-26 | 1 | -1/+22 |
| | | | | | | |||||
| | * | | | | Don't hide dev jobs just because there isn't (yet) a dev deployment | Jon Marius Venstad | 2019-08-26 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #10407 from ↵ | Martin Polden | 2019-08-26 | 5 | -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 API | Martin Polden | 2019-08-26 | 5 | -23/+150 |
| | | | | | | |||||
| * | | | | | Merge pull request #10403 from vespa-engine/hakonhall/locate-mvn-from-path | Jon Marius Venstad | 2019-08-26 | 1 | -4/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Locate mvn from PATH | ||||
| | * | | | | | Locate mvn from PATH | Håkon Hallingstad | 2019-08-26 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10405 from vespa-engine/bratseth/add-not-to-not | Jon Bratseth | 2019-08-26 | 4 | -20/+56 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Supoprt and'ing two not's | ||||
| | * | | | | | | Supoprt and'ing two not's | Jon Bratseth | 2019-08-26 | 4 | -20/+56 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #10394 from vespa-engine/andreer/separate-store-for-app-certs | Andreas Eriksen | 2019-08-26 | 7 | -56/+54 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | andreer/separate-store-for-app-certs | ||||
| | * | | | | | separate zk path for application certificates | andreer | 2019-08-23 | 7 | -56/+54 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10398 from ↵ | Geir Storli | 2019-08-26 | 10 | -56/+58 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/add-workaround-for-aligned-entry-ref Rename UniqueStoreSaver to UniqueStoreEnumerator. | ||||
| | * | | | | | | Fix class comment. | Tor Egge | 2019-08-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Rename UniqueStoreSaver => UniqueStoreEnumerator. | Tor Egge | 2019-08-23 | 8 | -46/+45 |
| | | | | | | | | |||||
| | * | | | | | | Trim down include. | Tor Egge | 2019-08-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add workaround for use of deprecated AlignedEntryRefT. | Tor Egge | 2019-08-23 | 4 | -8/+11 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #10397 from ↵ | Geir Storli | 2019-08-26 | 5 | -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 Storli | 2019-08-23 | 5 | -60/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions directly from that API. | ||||
| | * | | | | | | Change typedef -> using. | Geir Storli | 2019-08-23 | 1 | -22/+24 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #10389 from vespa-engine/mpolden/rotation-status-updater | Martin Polden | 2019-08-26 | 14 | -131/+264 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Retrieve rotation status from GlobalRoutingService |