summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NULL -> nullptrHenning Baldersheim2018-09-272-12/+12
* - NULL -> nullptrHenning Baldersheim2018-09-2714-104/+90
* Merge pull request #7124 from vespa-engine/mpolden/re-use-jersey-clientBjørn Christian Seime2018-09-271-31/+27
|\
| * Re-use Jersey clientMartin Polden2018-09-271-31/+27
* | Merge pull request #7120 from vespa-engine/balder/passthrough-for-updates-to-...Henning Baldersheim2018-09-2717-85/+101
|\ \
| * | Split the field types validation into a partial and a full, where the partial...Henning Baldersheim2018-09-273-1/+35
| * | Small test are better to keep in the code.Henning Baldersheim2018-09-276-67/+45
| * | When you want to let them through, you can not only give them partial rights.Henning Baldersheim2018-09-278-17/+21
* | | Merge pull request #7123 from vespa-engine/arnej/avoid-default-charsetHenning Baldersheim2018-09-271-1/+2
|\ \ \
| * | | avoid depending on default charsetArne Juul2018-09-271-1/+2
|/ / /
* | | Merge pull request #7122 from vespa-engine/jvenstad/give-up-when-job-no-longe...Torbjørn Smørgrav2018-09-271-3/+8
|\ \ \
| * | | Give up when job is removed from deployment.xmlJon Marius Venstad2018-09-271-3/+8
| | |/ | |/|
* | | Merge pull request #7081 from vespa-engine/vekterli/add-tls-protocol-snooping...Tor Brede Vekterli2018-09-277-4/+250
|\ \ \
| * | | Address code review feedbackTor Brede Vekterli2018-09-253-12/+26
| * | | Add functionality for detecting whether a client is using TLS or notTor Brede Vekterli2018-09-257-4/+236
* | | | Merge pull request #7119 from vespa-engine/arnej/render-empty-stringsHenning Baldersheim2018-09-273-9/+8
|\ \ \ \
| * | | | add empty string in array unit testArne Juul2018-09-271-1/+5
| * | | | actually suppress missing valgrind warningArne Juul2018-09-271-1/+1
| * | | | only suppress complete fields with empty stringArne Juul2018-09-271-7/+2
* | | | | Merge pull request #7113 from vespa-engine/jvenstad/validate-zones-have-jobsJon Marius Venstad2018-09-274-25/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Unit test illegal deployment specJon Marius Venstad2018-09-271-0/+13
| * | | | Conform to styleJon Marius Venstad2018-09-271-16/+16
| * | | | Validate before storing, and make clear that method has side effects (storing)Jon Marius Venstad2018-09-272-10/+6
| * | | | Validate zones w.r.t. deployment jobs as well!Jon Marius Venstad2018-09-262-0/+3
| | |_|/ | |/| |
* | | | Merge pull request #7110 from vespa-engine/freva/start-again-if-resumed-after...Valerij Fredriksen2018-09-275-42/+96
|\ \ \ \ | |_|/ / |/| | |
| * | | Start services if they have been stoppedValerij Fredriksen2018-09-264-13/+71
| * | | Simplify method namesValerij Fredriksen2018-09-265-13/+9
| * | | Handle suspend failure in NodeAgent insteadValerij Fredriksen2018-09-264-20/+20
* | | | Merge pull request #7117 from vespa-engine/hakonhall/fix-casing-of-serialized...Håkon Hallingstad2018-09-262-3/+3
|\ \ \ \
| * | | | Ignore case when comparing cloudHåkon Hallingstad2018-09-261-1/+1
| * | | | Fix casing of serialized cloudHåkon Hallingstad2018-09-262-3/+3
* | | | | Merge pull request #7118 from vespa-engine/balder/handle-that-files-does-not-...Henning Baldersheim2018-09-263-8/+18
|\ \ \ \ \
| * | | | | Use full path instead of just filename, as it might contain a path.Henning Baldersheim2018-09-261-2/+3
| * | | | | Just accept that the file being dropped does not exist. Also sync the file be...Henning Baldersheim2018-09-262-1/+8
| * | | | | Do not try to compress or in any way handle a file that does not exist.Henning Baldersheim2018-09-261-9/+11
|/ / / / /
* | | | | Merge pull request #7108 from vespa-engine/vekterli/add-more-detailed-visitor...Geir Storli2018-09-261-0/+4
|\ \ \ \ \
| * | | | | Add more detailed visitor lifetime metricsTor Brede Vekterli2018-09-261-0/+4
* | | | | | Merge pull request #7116 from vespa-engine/revert-7098-frodelu/combined-api-urisJon Bratseth2018-09-265-24/+8
|\ \ \ \ \ \
| * | | | | | Revert "Adding getConfigServerApiUris() to include both cfg servers and VIP [...Henning Baldersheim2018-09-265-24/+8
|/ / / / / /
* | | | | | Merge pull request #7098 from vespa-engine/frodelu/combined-api-urisJon Bratseth2018-09-265-8/+24
|\ \ \ \ \ \
| * | | | | | Adding getConfigServerApiUris() to include both cfg servers and VIP [VESPA-12...Frode Lundgren2018-09-255-8/+24
* | | | | | | Merge pull request #7109 from vespa-engine/revert-7106-revert-7100-balder/add...Henning Baldersheim2018-09-266-4/+164
|\ \ \ \ \ \ \
| * | | | | | | Make legger static and add some interface commentsHenning Baldersheim2018-09-261-1/+12
| * | | | | | | Exclude jna from container-devHenning Baldersheim2018-09-261-0/+4
| * | | | | | | Use a property for versionHenning Baldersheim2018-09-261-1/+2
| * | | | | | | Revert "Revert "Balder/add native fadvise""Henning Baldersheim2018-09-265-4/+148
* | | | | | | | Merge pull request #7111 from vespa-engine/gjoranv/separate-packagesBjørn Christian Seime2018-09-268-12/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Create separate packages for activator test bundles.gjoranv2018-09-268-12/+12
|/ / / / / / /
* | | | | | | Merge pull request #7107 from vespa-engine/arnej/less-operator-plusplusTor Brede Vekterli2018-09-2610-59/+38
|\ \ \ \ \ \ \
| * | | | | | | avoid "clever" operator++ overloadArne Juul2018-09-2610-59/+38