Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #4152 from vespa-engine/lesters/add-tensor-set-membership-... | Jon Bratseth | 2017-11-15 | 1 | -4/+28 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add Java ranking set membership for tensors | Lester Solbakken | 2017-11-15 | 1 | -4/+28 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4150 from vespa-engine/lesters/add-java-ranking-power-ope... | Jon Bratseth | 2017-11-15 | 7 | -7/+36 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add Java ranking power operator | Lester Solbakken | 2017-11-15 | 7 | -7/+36 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4148 from vespa-engine/lesters/add-java-ranking-boolean-o... | Jon Bratseth | 2017-11-15 | 10 | -19/+187 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add boolean operators to Java ranking evaluation | Lester Solbakken | 2017-11-15 | 10 | -19/+187 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4142 from vespa-engine/revert-4127-bratseth/remove-trigge... | Martin Polden | 2017-11-15 | 13 | -77/+224 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "Remove redundant logic" | Harald Musum | 2017-11-15 | 13 | -77/+224 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4139 from vespa-engine/bjorncs/stop-logging-harmless-exce... | Bjørn Christian Seime | 2017-11-15 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Don't log org.eclipse.jetty.io.EofException as warning | Bjørn Christian Seime | 2017-11-15 | 1 | -1/+6 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4137 from vespa-engine/jvenstad/minor-bug-squash | Jon Marius Venstad | 2017-11-15 | 1 | -16/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Restore condition to its intention, without the redundant part | Jon Marius Venstad | 2017-11-15 | 1 | -14/+1 | |
| * | | | | | | Avoid potential NPEs and fix a condition | Jon Marius Venstad | 2017-11-15 | 1 | -3/+3 | |
* | | | | | | | Merge pull request #4128 from vespa-engine/hakonhall/print-exception-since-lo... | gjoranv | 2017-11-15 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Print exception since logging may not have been setup | Håkon Hallingstad | 2017-11-14 | 1 | -0/+2 | |
* | | | | | | | Merge pull request #4134 from vespa-engine/bjorncs/port-scheme-access-logging | Bjørn Christian Seime | 2017-11-15 | 4 | -5/+47 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Add 'secure' and 'local-port' to JSON access log | Bjørn Christian Seime | 2017-11-15 | 4 | -5/+47 | |
* | | | | | | | Merge pull request #4138 from vespa-engine/hmusum/remove-minSlobroksPerCluster | Håkon Hallingstad | 2017-11-15 | 3 | -5/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove support for minSlobroksPerCluster | Harald Musum | 2017-11-15 | 3 | -5/+0 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4135 from vespa-engine/revert-4130-revert-4125-hmusum/mov... | Henning Baldersheim | 2017-11-15 | 8 | -38/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use correct namespace | Harald Musum | 2017-11-14 | 2 | -3/+3 | |
| * | | | | | | | Revert "Revert "Move filedistribution config definitions to configdefinitions... | Harald Musum | 2017-11-14 | 6 | -35/+5 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4127 from vespa-engine/bratseth/remove-trigger-failed | Jon Marius Venstad | 2017-11-15 | 13 | -224/+77 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Remove DelayedDeployer as it is covered by ReadyJobsTrigger | Jon Bratseth | 2017-11-14 | 5 | -62/+5 | |
| * | | | | | | Remove redundant logic | Jon Bratseth | 2017-11-14 | 12 | -163/+73 | |
* | | | | | | | Merge pull request #4136 from vespa-engine/revert-4120-mortent/treat-lbaddres... | Harald Musum | 2017-11-14 | 9 | -44/+39 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "Treat loadbalancer address as string and pass through" | Harald Musum | 2017-11-14 | 9 | -44/+39 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4109 from vespa-engine/jvenstad/recursive-application-api | Jon Bratseth | 2017-11-14 | 16 | -119/+458 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fixed more responses" | Jon Marius Venstad | 2017-11-14 | 2 | -1/+2 | |
| * | | | | | | Use @include and list self-info in tenant and application blobs | Jon Marius Venstad | 2017-11-14 | 15 | -640/+136 | |
| * | | | | | | Test recursive responses at tenant and application level as well | Jon Marius Venstad | 2017-11-14 | 3 | -0/+530 | |
| * | | | | | | Added tenant name to recursive root response, moved stuff, and test | Jon Marius Venstad | 2017-11-14 | 3 | -39/+349 | |
| * | | | | | | Moved stuff around, and special behaviour for "recursive=true" | Jon Marius Venstad | 2017-11-14 | 3 | -81/+83 | |
* | | | | | | | Merge pull request #4130 from vespa-engine/revert-4125-hmusum/move-filedistri... | Henning Baldersheim | 2017-11-14 | 6 | -5/+35 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "Move filedistribution config definitions to configdefinitions module" | Harald Musum | 2017-11-14 | 6 | -5/+35 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #4129 from vespa-engine/havardpe/avoid-premature-iterator-... | Henning Baldersheim | 2017-11-14 | 2 | -22/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | we need to keep all iterators to handle additional ranges | Håvard Pettersen | 2017-11-14 | 2 | -22/+5 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4125 from vespa-engine/hmusum/move-filedistribution-confi... | Henning Baldersheim | 2017-11-14 | 6 | -35/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | def files have been moved | Harald Musum | 2017-11-14 | 2 | -5/+1 | |
| * | | | | | | | Move filedistribution config definitions to configdefinitions module | Harald Musum | 2017-11-14 | 4 | -30/+4 | |
* | | | | | | | | Merge pull request #4113 from vespa-engine/toregge/use-std-mutex-in-searchcor... | Geir Storli | 2017-11-14 | 2 | -34/+35 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use std::lock_guard and scopes instead of std::unique_lock. | Tor Egge | 2017-11-14 | 1 | -14/+17 | |
| * | | | | | | | | Use std::mutex in searchore PersistenceEngine. | Tor Egge | 2017-11-14 | 2 | -23/+21 | |
* | | | | | | | | | Merge pull request #4117 from vespa-engine/toregge/propagate-bucket-space-to-... | Geir Storli | 2017-11-14 | 6 | -23/+26 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Supply bucket space to operation target resolver implementation and propagate | Tor Egge | 2017-11-14 | 6 | -23/+26 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4123 from vespa-engine/toregge/consolidate-makebucketspac... | Geir Storli | 2017-11-14 | 14 | -39/+38 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Consolidate makeBucketSpace() test functions to document module. | Tor Egge | 2017-11-14 | 14 | -39/+38 | |
* | | | | | | | | | | Merge pull request #4120 from vespa-engine/mortent/treat-lbaddress-asstring | Bjørn Christian Seime | 2017-11-14 | 9 | -39/+44 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Treat loadbalancer address as string and pass through | Morten Tokle | 2017-11-14 | 9 | -39/+44 | |
* | | | | | | | | | | Merge pull request #4124 from vespa-engine/balder/add-chunked-file-rpc-skelet... | Henning Baldersheim | 2017-11-14 | 1 | -6/+45 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | |