summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | SimplifyMartin Polden2019-01-171-5/+5
| * | | | | | | Extract filterable load balancer listMartin Polden2019-01-176-40/+69
| * | | | | | | Add networks fieldMartin Polden2019-01-174-3/+23
| * | | | | | | Ensure unique ports and realsMartin Polden2019-01-176-34/+55
| * | | | | | | Require non-null fieldsMartin Polden2019-01-171-4/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #8177 from vespa-engine/ollivir/rectify-timeout-error-typeOlli Virtanen2019-01-241-9/+6
|\ \ \ \ \ \ \
| * | | | | | | Minor typo fixOlli Virtanen2019-01-161-1/+1
| * | | | | | | Use the correct error type for timeouts, and only create one errorOlli Virtanen2019-01-161-9/+6
* | | | | | | | Merge pull request #8181 from vespa-engine/hakonhall/define-enable-logserver-...Håkon Hallingstad2019-01-2416-44/+103
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hakonhall/define-enable-logserver-flagHåkon Hallingstad2019-01-221045-37083/+9151
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Get useDedicatedNodeForLogserver from flagHåkon Hallingstad2019-01-1716-80/+29
| * | | | | | | | Define enable logserver flagHåkon Hallingstad2019-01-1723-42/+152
* | | | | | | | | Merge pull request #8169 from vespa-engine/freva/restart-on-memory-changeValerij Fredriksen2019-01-244-20/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Restart container on memory changeValerij Fredriksen2019-01-164-20/+86
* | | | | | | | | | Merge pull request #8203 from vespa-engine/hakonhall/reduce-log-spamHåkon Hallingstad2019-01-241-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reduce log spamHåkon Hallingstad2019-01-221-3/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #8222 from vespa-engine/balder/proper-bool-json-rendering-...Henning Baldersheim2019-01-243-1/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoid * importHenning Baldersheim2019-01-241-1/+4
| * | | | | | | | | | Render bool fields as native json bool type.Henning Baldersheim2019-01-242-1/+3
| * | | | | | | | | | Currently bool is printed as a json string.Henning Baldersheim2019-01-241-0/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #8204 from vespa-engine/balder/namespace-cleanupHenning Baldersheim2019-01-2472-532/+310
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Undo syntax layout changesHenning Baldersheim2019-01-231-5/+10
| * | | | | | | | | Undo clion auto formatHenning Baldersheim2019-01-221-387/+362
| * | | | | | | | | nested namepace and related cleanupHenning Baldersheim2019-01-2272-831/+629
| |/ / / / / / / /
* | | | | | | | | Merge pull request #8190 from vespa-engine/vekterli/explicit-asciistream-move...Henning Baldersheim2019-01-243-5/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure that asciistream moves and swaps have expected semanticsTor Brede Vekterli2019-01-173-5/+49
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #8206 from vespa-engine/balder/implement-assignment-oeratorsHenning Baldersheim2019-01-243-0/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Covariant return type.Henning Baldersheim2019-01-232-10/+15
| * | | | | | | | | Add tests for the obscure virtual assignment operators.Henning Baldersheim2019-01-223-0/+64
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #8217 from vespa-engine/arnej/avoid-alternatives-inside-ph...Jon Bratseth2019-01-249-39/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stop making alternatives inside phrasesArne Juul2019-01-233-35/+68
| * | | | | | | | | unit test toString() of phrase containing alternativesArne Juul2019-01-231-0/+1
| * | | | | | | | | handle more item subclassesArne Juul2019-01-231-2/+3
| * | | | | | | | | provide full info dump from stringValue()Arne Juul2019-01-231-1/+7
| * | | | | | | | | document and fix getNumWords()Arne Juul2019-01-234-1/+4
* | | | | | | | | | Merge pull request #8184 from vespa-engine/balder/control-environment-varJon Bratseth2019-01-235-2/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | jdisc -> containerHenning Baldersheim2019-01-181-4/+3
| * | | | | | | | | | Rename and reduce visibility of ENVIRONMENT_VARIABLES_ELEMENTHenning Baldersheim2019-01-182-3/+2
| * | | | | | | | | | Use xml element syntax to add environment variables.Henning Baldersheim2019-01-184-5/+23
| * | | | | | | | | | It is a long time since YELL_MA_EURO=INXIGHT made any sense...Henning Baldersheim2019-01-171-1/+1
| * | | | | | | | | | Add control of extra environment variables.Henning Baldersheim2019-01-175-0/+29
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #8180 from vespa-engine/bratseth/handle-multiple-sync-resu...Jon Bratseth2019-01-2317-69/+108
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle multiple results per document in a sync batchJon Bratseth2019-01-231-0/+17
| * | | | | | | | | | Use same reservation expiry in all zonesHarald Musum2019-01-231-2/+1
| * | | | | | | | | | Build master branchBjørn Christian Seime2019-01-231-1/+1
| * | | | | | | | | | We execute the java binary explicitly when compiling. Need to adjust PATH. Al...Arnstein Ressem2019-01-231-1/+2
| * | | | | | | | | | Copr does not allow using the alternatives command. Setting JAVA_HOME is enou...Arnstein Ressem2019-01-231-2/+3
| * | | | | | | | | | Use major from deployment.xml when deploying to dev/perfJon Marius Venstad2019-01-232-4/+4
| * | | | | | | | | | Revert "Default to system version when deploying to dev"Jon Marius Venstad2019-01-232-1/+22
| * | | | | | | | | | remove test that does not make that much sense.Henning Baldersheim2019-01-231-6/+0