summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #9208 from vespa-engine/jvenstad/config-fixHarald Musum2019-04-2918-84/+153
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Jvenstad/config fix
| * | | | | Use common lock for all tenant sessions manipulationsJon Marius Venstad2019-04-2714-34/+46
| | | | | |
| * | | | | Keep some changes from original commitJon Marius Venstad2019-04-277-56/+113
| | |_|_|/ | |/| | |
* | | | | Merge pull request #9212 from ↵Henning Baldersheim2019-04-287-16/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9200-revert-9175-revert-9157-hmusum/update-java-lz4-dep Revert "Revert "Revert "Update to newer java lz4 version (1.5.1) and use new artifact ids"""
| * | | | | Revert "Revert "Revert "Update to newer java lz4 version (1.5.1) and use new ↵Harald Musum2019-04-287-16/+16
|/ / / / / | | | | | | | | | | | | | | | artifact ids"""
* | | | | Merge pull request #9211 from vespa-engine/balder/narrow-the-gap-to-vespafeederHarald Musum2019-04-284-42/+65
|\ \ \ \ \ | | | | | | | | | | | | Close the gap to vespafeeder and add support for the test-and-set con…
| * | | | | Close the gap to vespafeeder and add support for the test-and-set condition.Henning Baldersheim2019-04-284-42/+65
|/ / / / /
* | | | | Merge pull request #9200 from ↵Harald Musum2019-04-287-16/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/revert-9175-revert-9157-hmusum/update-java-lz4-dep Revert "Revert "Update to newer java lz4 version (1.5.1) and use new artifact ids""
| * | | | Revert "Revert "Update to newer java lz4 version (1.5.1) and use new ↵Harald Musum2019-04-267-16/+16
| |/ / / | | | | | | | | | | | | artifact ids""
* | | | Merge pull request #9206 from vespa-engine/jvenstad/copy-only-prod-packagesJon Marius Venstad2019-04-271-1/+1
|\ \ \ \ | | | | | | | | | | Copy only production packages when migrating to SDv4
| * | | | Copy only production packages when migrating to SDv4Jon Marius Venstad2019-04-271-1/+1
| | | | |
* | | | | Merge pull request #9207 from ↵Valerij Fredriksen2019-04-275-62/+24
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/revert-9204-bratseth/document-api-donct-blame-users Revert "Separate user and system exceptions"
| * | | | Revert "Separate user and system exceptions"Harald Musum2019-04-275-62/+24
|/ / / /
* | | | Merge pull request #9205 from ↵Arnstein Ressem2019-04-2613-366/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9196-mpolden/expose-routing-policy-endpoint Revert "Add routing policy endpoint to serviceUrls"
| * | | | Revert "Add routing policy endpoint to serviceUrls"Harald Musum2019-04-2613-366/+112
| | | | |
* | | | | Merge pull request #9204 from ↵Jon Bratseth2019-04-265-24/+62
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/bratseth/document-api-donct-blame-users Separate user and system exceptions
| * | | | Separate user and system exceptionsJon Bratseth2019-04-265-24/+62
| | | | |
* | | | | Merge pull request #9194 from ↵Henning Baldersheim2019-04-2615-453/+257
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | vespa-engine/balder/make-thread-safe-storage-policy Balder/make thread safe storage policy
| * | | | Update copyright.Henning Baldersheim2019-04-261-1/+1
| | | | |
| * | | | Update ABI.Henning Baldersheim2019-04-261-68/+26
| | | | |
| * | | | Get rid of very complicated and inherently thread unsafe code as external ↵Henning Baldersheim2019-04-2612-338/+134
| | | | | | | | | | | | | | | | | | | | slobrok/configserver support is long gone.
| * | | | And then some more finalHenning Baldersheim2019-04-263-25/+36
| | | | |
| * | | | Group volatiles together and use more final members.Henning Baldersheim2019-04-261-21/+33
| | | | |
| * | | | Use syncronized and ordinary boolean firstTryHenning Baldersheim2019-04-261-10/+12
| | | | |
| * | | | Add some more synchronized to ensure thread visibilityHenning Baldersheim2019-04-262-14/+19
| | | | |
| * | | | And then there were more.....Henning Baldersheim2019-04-261-11/+19
| | | | |
| * | | | Use AtomicReference instead of volatile.Henning Baldersheim2019-04-261-6/+7
| | | | |
| * | | | Also protect oldClusterVersionGottenCountHenning Baldersheim2019-04-261-3/+4
| | | | |
| * | | | Make cachedClusterState thread safe.Henning Baldersheim2019-04-261-5/+9
| | | | |
| * | | | No '*' importsHenning Baldersheim2019-04-261-8/+11
| | | | |
| * | | | Make validRandomTargets thread safe.Henning Baldersheim2019-04-261-2/+5
| | | | |
* | | | | Merge pull request #9198 from vespa-engine/andreer/certificate-managerAndreas Eriksen2019-04-263-7/+18
|\ \ \ \ \ | |_|/ / / |/| | | | andreer/certificate manager
| * | | | leave certificatemanager for next PRandreer2019-04-263-51/+0
| | | | |
| * | | | create multiple records when requiredandreer2019-04-172-7/+9
| | | | |
| * | | | WIPandreer2019-04-124-0/+60
| | | | |
* | | | | Merge pull request #9203 from vespa-engine/bratseth/explicit-in-yqlJo Kristian Bergum2019-04-263-23/+12
|\ \ \ \ \ | | | | | | | | | | | | Mark phrases as explicit
| * | | | | Mark phrases as explicitJon Bratseth2019-04-263-23/+12
| | |_|/ / | |/| | |
* | | | | Merge pull request #9199 from vespa-engine/ollivir/ensure-capacity-in-hitgroupOlli Virtanen2019-04-266-135/+148
|\ \ \ \ \ | |/ / / / |/| | | | Avoid dynamic ArrayList growth in HitGroup when number of hits is known
| * | | | Import cleanupOlli Virtanen2019-04-261-1/+0
| | | | |
| * | | | Avoid dynamic ArrayList growth in HitGroup when number of hits is knownOlli Virtanen2019-04-266-135/+149
|/ / / /
* | | | Merge pull request #9044 from ↵Jon Bratseth2019-04-269-80/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9043-revert-9026-bratseth/better-negative-number-heuristics Revert "Revert "Better heuristics for negative numbers""
| * | | | Correct heuristic for -a:bJon Bratseth2019-04-123-2/+15
| | | | |
| * | | | Revert "Revert "Better heuristics for negative numbers""Jon Bratseth2019-04-088-79/+90
| | | | |
* | | | | Merge pull request #9197 from ↵Arnstein Ressem2019-04-269-140/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9159-hmusum/fix-config-model-inconsistency-8 Revert "Synchronise access to session status of an application, and eliminate…"
| * | | | | Revert "Synchronise access to session status of an application, and ↵Harald Musum2019-04-269-140/+79
|/ / / / / | | | | | | | | | | | | | | | eliminate…"
* | | | | Merge pull request #9196 from ↵Martin Polden2019-04-2613-112/+366
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/expose-routing-policy-endpoint Add routing policy endpoint to serviceUrls
| * | | | | Ignore unstable values in test dataMartin Polden2019-04-261-3/+3
| | | | | |
| * | | | | Add routing policy endpoint to serviceUrlsMartin Polden2019-04-265-23/+259
| | | | | |
| * | | | | Move deployCompletely to tester classMartin Polden2019-04-263-52/+36
| | | | | |
| * | | | | Rename endpointsIn -> rotationEndpointsInMartin Polden2019-04-262-3/+3
| | | | | |