Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8187 from vespa-engine/bjorncs/jrt-transport-metrics | Bjørn Christian Seime | 2019-01-24 | 41 | -294/+204 |
|\ | |||||
| * | Add calculation of metrics changes since previous snapshot | Bjørn Christian Seime | 2019-01-22 | 3 | -38/+54 |
| * | Update copyright header | Bjørn Christian Seime | 2019-01-22 | 1 | -1/+1 |
| * | Propagate jrt transport metrics to metrics framework | Bjørn Christian Seime | 2019-01-22 | 2 | -0/+47 |
| * | Make TransportMetrics a singleton | Bjørn Christian Seime | 2019-01-22 | 11 | -45/+58 |
| * | Add method to create snapshot of transport metrics | Bjørn Christian Seime | 2019-01-22 | 1 | -0/+35 |
| * | Revert "Add tracking of jrt metrics" | Bjørn Christian Seime | 2019-01-22 | 4 | -128/+0 |
| * | Revert "Add DefaultJrtFactory as component to container clusters" | Bjørn Christian Seime | 2019-01-22 | 1 | -2/+0 |
| * | Revert "Add jrt supervisor as constructor parameter" | Bjørn Christian Seime | 2019-01-22 | 1 | -6/+1 |
| * | Revert "Use JrtFactory to construct jrt supervisors in configserver" | Bjørn Christian Seime | 2019-01-22 | 22 | -113/+47 |
* | | Merge pull request #8219 from vespa-engine/bjorncs/travis | Bjørn Christian Seime | 2019-01-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | Pass extra Maven arguments to bootstrap script | Bjørn Christian Seime | 2019-01-23 | 1 | -1/+1 |
* | | | Merge pull request #8185 from vespa-engine/mpolden/lb-acl | Martin Polden | 2019-01-24 | 15 | -114/+224 |
|\ \ \ | |||||
| * | | | Move inactive filter to LoadBalancerList | Martin Polden | 2019-01-17 | 2 | -13/+13 |
| * | | | Add load balancer networks to node ACL | Martin Polden | 2019-01-17 | 3 | -25/+63 |
| * | | | Simplify | Martin Polden | 2019-01-17 | 1 | -5/+5 |
| * | | | Extract filterable load balancer list | Martin Polden | 2019-01-17 | 6 | -40/+69 |
| * | | | Add networks field | Martin Polden | 2019-01-17 | 4 | -3/+23 |
| * | | | Ensure unique ports and reals | Martin Polden | 2019-01-17 | 6 | -34/+55 |
| * | | | Require non-null fields | Martin Polden | 2019-01-17 | 1 | -4/+6 |
* | | | | Merge pull request #8177 from vespa-engine/ollivir/rectify-timeout-error-type | Olli Virtanen | 2019-01-24 | 1 | -9/+6 |
|\ \ \ \ | |||||
| * | | | | Minor typo fix | Olli Virtanen | 2019-01-16 | 1 | -1/+1 |
| * | | | | Use the correct error type for timeouts, and only create one error | Olli Virtanen | 2019-01-16 | 1 | -9/+6 |
* | | | | | Merge pull request #8181 from vespa-engine/hakonhall/define-enable-logserver-... | Håkon Hallingstad | 2019-01-24 | 16 | -44/+103 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into hakonhall/define-enable-logserver-flag | Håkon Hallingstad | 2019-01-22 | 1045 | -37083/+9151 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Get useDedicatedNodeForLogserver from flag | Håkon Hallingstad | 2019-01-17 | 16 | -80/+29 |
| * | | | | | Define enable logserver flag | Håkon Hallingstad | 2019-01-17 | 23 | -42/+152 |
* | | | | | | Merge pull request #8169 from vespa-engine/freva/restart-on-memory-change | Valerij Fredriksen | 2019-01-24 | 4 | -20/+86 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Restart container on memory change | Valerij Fredriksen | 2019-01-16 | 4 | -20/+86 |
* | | | | | | | Merge pull request #8203 from vespa-engine/hakonhall/reduce-log-spam | Håkon Hallingstad | 2019-01-24 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reduce log spam | Håkon Hallingstad | 2019-01-22 | 1 | -3/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #8222 from vespa-engine/balder/proper-bool-json-rendering-... | Henning Baldersheim | 2019-01-24 | 3 | -1/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Avoid * import | Henning Baldersheim | 2019-01-24 | 1 | -1/+4 |
| * | | | | | | | Render bool fields as native json bool type. | Henning Baldersheim | 2019-01-24 | 2 | -1/+3 |
| * | | | | | | | Currently bool is printed as a json string. | Henning Baldersheim | 2019-01-24 | 1 | -0/+2 |
* | | | | | | | | Merge pull request #8204 from vespa-engine/balder/namespace-cleanup | Henning Baldersheim | 2019-01-24 | 72 | -532/+310 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Undo syntax layout changes | Henning Baldersheim | 2019-01-23 | 1 | -5/+10 |
| * | | | | | | | Undo clion auto format | Henning Baldersheim | 2019-01-22 | 1 | -387/+362 |
| * | | | | | | | nested namepace and related cleanup | Henning Baldersheim | 2019-01-22 | 72 | -831/+629 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #8190 from vespa-engine/vekterli/explicit-asciistream-move... | Henning Baldersheim | 2019-01-24 | 3 | -5/+49 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ensure that asciistream moves and swaps have expected semantics | Tor Brede Vekterli | 2019-01-17 | 3 | -5/+49 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #8206 from vespa-engine/balder/implement-assignment-oerators | Henning Baldersheim | 2019-01-24 | 3 | -0/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Covariant return type. | Henning Baldersheim | 2019-01-23 | 2 | -10/+15 |
| * | | | | | | | Add tests for the obscure virtual assignment operators. | Henning Baldersheim | 2019-01-22 | 3 | -0/+64 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #8217 from vespa-engine/arnej/avoid-alternatives-inside-ph... | Jon Bratseth | 2019-01-24 | 9 | -39/+83 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stop making alternatives inside phrases | Arne Juul | 2019-01-23 | 3 | -35/+68 |
| * | | | | | | | unit test toString() of phrase containing alternatives | Arne Juul | 2019-01-23 | 1 | -0/+1 |
| * | | | | | | | handle more item subclasses | Arne Juul | 2019-01-23 | 1 | -2/+3 |
| * | | | | | | | provide full info dump from stringValue() | Arne Juul | 2019-01-23 | 1 | -1/+7 |
| * | | | | | | | document and fix getNumWords() | Arne Juul | 2019-01-23 | 4 | -1/+4 |