aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ensure the thread has passed the _pseudo_threadHenning Baldersheim2018-10-051-0/+2
* Merge pull request #7209 from vespa-engine/balder/remove-dangerous-interfaceHenning Baldersheim2018-10-0439-317/+246
|\
| * Remove the costly and unnecessary setSlobrokId interface.Henning Baldersheim2018-10-0426-194/+169
| * Remove the costly and unnecessary setSlobrokId interface.Henning Baldersheim2018-10-0414-127/+81
|/
* Merge pull request #7208 from vespa-engine/balder/remove-unused-codeHenning Baldersheim2018-10-045-16/+2
|\
| * Remove unused code for generation callbackHenning Baldersheim2018-10-045-16/+2
|/
* Merge pull request #7205 from vespa-engine/hakonhall/support-skipping-hostnam...Håkon Hallingstad2018-10-043-8/+31
|\
| * Support skipping hostname resolution verificationHåkon Hallingstad2018-10-043-8/+31
* | Merge pull request #7207 from vespa-engine/havardpe/avoid-waiting-for-ourself...Geir Storli2018-10-044-42/+25
|\ \
| * | avoid shutdown deadlock with yourselfHåvard Pettersen2018-10-044-42/+25
|/ /
* | Merge pull request #7196 from vespa-engine/revert-7195-revert-7190-balder/red...Henning Baldersheim2018-10-04108-632/+696
|\ \
| * | No longer any DeployState field in VespaModelHenning Baldersheim2018-10-041-14/+0
| * | Enforce DeployState propagationHenning Baldersheim2018-10-0420-72/+59
| * | Wire in DeployState as paramHenning Baldersheim2018-10-0482-449/+515
| * | Propagate a valid deployLogger.Henning Baldersheim2018-10-041-3/+3
| * | Revert "Revert "Balder/reduce usage of complex deploystate""Henning Baldersheim2018-10-0419-125/+150
| |/
* | Merge pull request #7185 from vespa-engine/aressem/kill-mbuildArnstein Ressem2018-10-042-1/+20
|\ \
| * \ Merge branch 'master' into aressem/kill-mbuildArnstein Ressem2018-10-032840-281881/+115787
| |\ \
| * | | Rename function to match variable name.Arnstein Ressem2018-10-032-3/+3
| * | | Only create symlinks if directory exists.Arnstein Ressem2018-08-091-1/+1
| * | | Merge branch 'master' into aressem/kill-mbuildArnstein Ressem2018-08-09586-4666/+11074
| |\ \ \
| * | | | Escape $ in env lookup to preserve the command.Arnstein Ressem2018-08-081-2/+2
| * | | | Install module dependencies in separate dir and symlink.Arnstein Ressem2018-08-081-5/+6
| * | | | Absolute path to link.Arnstein Ressem2018-08-061-1/+1
| * | | | Use ln instead of cmake for generating links as this will allow to link files...Arnstein Ressem2018-08-061-1/+1
| * | | | Only use install prefix on target.Arnstein Ressem2018-07-311-1/+1
| * | | | Add install_symlink funciton.Arnstein Ressem2018-07-311-0/+4
| * | | | Make it possible to dynamically add submodules for extra projects.Arnstein Ressem2018-07-122-0/+14
* | | | | Merge pull request #7197 from vespa-engine/smorgrav/expand_nameserviceTorbjørn Smørgrav2018-10-042-8/+19
|\ \ \ \ \
| * | | | | Typotoby2018-10-041-1/+1
| * | | | | Remove deprication tag as it leads to compile errorstoby2018-10-041-2/+1
| * | | | | Remove rests from a bad ideatoby2018-10-041-3/+1
| * | | | | Add method to look up multiple records by name and apply thistoby2018-10-042-8/+22
* | | | | | Merge pull request #7204 from vespa-engine/revert-7182-revert-7177-revert-715...Harald Musum2018-10-041-5/+4
|\ \ \ \ \ \
| * | | | | | Revert "Revert "Revert "Enable dedicated log server nodes in all dev and perf...Harald Musum2018-10-041-5/+4
* | | | | | | Merge pull request #7202 from vespa-engine/vekterli/export-correct-createiter...Geir Storli2018-10-041-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix exported createiterator metric pathTor Brede Vekterli2018-10-041-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #7203 from vespa-engine/mpolden/even-more-controllerhostValerij Fredriksen2018-10-043-1/+21
|\ \ \ \ \ \ \
| * | | | | | | Support all node types in secret-agent configMartin Polden2018-10-042-0/+12
| * | | | | | | Mount sia directory on all infrastructure hostsMartin Polden2018-10-041-1/+9
| |/ / / / / /
* | | | | | | Merge pull request #7200 from vespa-engine/havardpe/discard-transport-events-...Arne H Juul2018-10-042-2/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | introduce pseudo-thread mutexHåvard Pettersen2018-10-042-2/+14
* | | | | | | Merge pull request #7199 from vespa-engine/jvenstad/logging-cleanup-for-issue...Martin Polden2018-10-042-19/+9
|\ \ \ \ \ \ \
| * | | | | | | Outer try-catch was in error; reduce log impact of inner one insteadJon Marius Venstad2018-10-042-19/+9
* | | | | | | | Merge pull request #7198 from vespa-engine/hmusum/remove-loggingValerij Fredriksen2018-10-043-11/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove some unnecessary loggingHarald Musum2018-10-043-11/+1
|/ / / / / / /
* | | | | | | Merge pull request #7195 from vespa-engine/revert-7190-balder/reduce-usage-of...Arnstein Ressem2018-10-0419-150/+125
|\ \ \ \ \ \ \
| * | | | | | | Revert "Balder/reduce usage of complex deploystate"Harald Musum2018-10-0419-150/+125
|/ / / / / / /
* | | | | | | Merge pull request #7190 from vespa-engine/balder/reduce-usage-of-complex-dep...Henning Baldersheim2018-10-0419-125/+150
|\ \ \ \ \ \ \
| * | | | | | | Needs deployState after VespaModel is constructed incomplete.Henning Baldersheim2018-10-033-8/+10