summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add suspended to application/v4Jon Bratseth2018-10-226-5/+54
* Add GET suspended status to application/v2Jon Bratseth2018-10-2224-26/+203
* Merge pull request #7373 from vespa-engine/jvenstad/decouple-test-framework-v...Jon Marius Venstad2018-10-221-1/+2
|\
| * Decouple test framework version from vespa version, like in hostedJon Marius Venstad2018-10-191-1/+2
* | Merge pull request #7391 from vespa-engine/balder/avoid-caching-stuff-you-alr...Harald Musum2018-10-227-87/+53
|\ \
| * | No more visibility than needed.Henning Baldersheim2018-10-211-11/+11
| * | Optional intended as a return value, not as fields.Henning Baldersheim2018-10-211-13/+12
| * | Only require Optional. + some intellij advise.Henning Baldersheim2018-10-214-14/+13
| * | GC unused parameters.Henning Baldersheim2018-10-213-36/+15
| * | No need to cache memoryPercentage as a member, when you already have access t...Henning Baldersheim2018-10-211-15/+4
|/ /
* | Merge pull request #7390 from vespa-engine/kkraune/sec-upgradeHarald Musum2018-10-211-1/+1
|\ \
| * | upgrade depKristian Aune2018-10-211-1/+1
|/ /
* | Merge pull request #7389 from vespa-engine/hmusum/log-node-details-when-faili...Harald Musum2018-10-201-1/+2
|\ \
| * | Log more when failing to add new docker nodeHarald Musum2018-10-201-1/+2
* | | Merge pull request #7388 from vespa-engine/revert-7374-bjorncs/use-g1Harald Musum2018-10-202-2/+2
|\ \ \ | |/ / |/| |
| * | Revert "Use G1GC as default"Bjørn Christian Seime2018-10-202-2/+2
|/ /
* | Merge pull request #7384 from vespa-engine/bjorncs/security-utilsBjørn Christian Seime2018-10-191-0/+1
|\ \
| * | Add security-utils to standalone-container specBjørn Christian Seime2018-10-191-0/+1
* | | Merge pull request #7386 from vespa-engine/revert-7381-toregge/handle-user-me...Geir Storli2018-10-192-56/+20
|\ \ \
| * | | Revert "Handle user metrics when generating metrics config for container clus...Tor Egge2018-10-192-56/+20
|/ / /
* | | Merge pull request #7382 from vespa-engine/balder/let-setting-of-memory-work-...Henning Baldersheim2018-10-194-7/+19
|\ \ \
| * | | Use orElseHenning Baldersheim2018-10-191-2/+2
| * | | Use an SettableOptional to handle xml processing independant of element order.Henning Baldersheim2018-10-194-6/+18
* | | | Merge pull request #7381 from vespa-engine/toregge/handle-user-metrics-when-g...Geir Storli2018-10-192-20/+56
|\ \ \ \ | |_|/ / |/| | |
| * | | Handle user metrics when generating metrics config for container cluster.Tor Egge2018-10-192-20/+56
| |/ /
* | | Merge pull request #7383 from vespa-engine/bjorncs/security-utilsgjoranv2018-10-192-4/+7
|\ \ \ | |/ / |/| |
| * | Install security-utils jarsBjørn Christian Seime2018-10-191-0/+3
| * | Add explicit dependency on security-utilsBjørn Christian Seime2018-10-191-4/+4
|/ /
* | Merge pull request #7379 from vespa-engine/havardpe/tls-half-closeTor Brede Vekterli2018-10-1912-4/+187
|\ \
| * | half_close for sync crypto socketsHåvard Pettersen2018-10-193-0/+38
| * | half_close for crypto socketsHåvard Pettersen2018-10-199-4/+149
| |/
* | Merge pull request #7376 from vespa-engine/bjorncs/use-maven-shade-plugingjoranv2018-10-199-97/+162
|\ \
| * | fixup! Use maven-shade-plugin to assemble fat jarBjørn Christian Seime2018-10-191-37/+36
| * | Use maven-shade-plugin to assemble fat jarBjørn Christian Seime2018-10-198-60/+126
* | | Merge pull request #7374 from vespa-engine/bjorncs/use-g1gjoranv2018-10-192-2/+2
|\ \ \
| * | | Setting NewRatio is not recommended for G1Bjørn Christian Seime2018-10-192-2/+2
| * | | Use G1GC as defaultBjørn Christian Seime2018-10-191-1/+1
* | | | Merge pull request #7377 from vespa-engine/bjorncs/security-utilsBjørn Christian Seime2018-10-1940-89/+72
|\ \ \ \ | |_|/ / |/| | |
| * | | Make jrt_test see transitive dependencies of jrtBjørn Christian Seime2018-10-192-62/+1
| * | | Move classes in com.yahoo.security to security-utilsBjørn Christian Seime2018-10-1938-27/+71
|/ / /
* | | Merge pull request #7375 from vespa-engine/revert-7344-bjorncs/security-libArnstein Ressem2018-10-1940-72/+89
|\ \ \ | |/ / |/| |
| * | Revert "Move classes in com.yahoo.security to security-utils"Harald Musum2018-10-1940-72/+89
|/ /
* | Merge pull request #7344 from vespa-engine/bjorncs/security-libgjoranv2018-10-1940-89/+72
|\ \
| * | Make jrt_test see transitive dependencies of jrtBjørn Christian Seime2018-10-182-62/+1
| * | Move classes in com.yahoo.security to security-utilsBjørn Christian Seime2018-10-1738-27/+71
* | | Merge pull request #7371 from vespa-engine/revert-7364-revert-7342-freva/move...Valerij Fredriksen2018-10-1924-432/+310
|\ \ \
| * | | Revert "Revert "NodeAdmin: Remove usage for Environment""Valerij Fredriksen2018-10-1824-432/+310
* | | | Merge pull request #7372 from vespa-engine/mortent/read-cert-chainMartin Polden2018-10-191-2/+3
|\ \ \ \
| * | | | Read certificate chainMorten Tokle2018-10-191-2/+3
| | |_|/ | |/| |
* | | | Merge pull request #7357 from vespa-engine/revert-7311-freva/fix-yamas-permis...Valerij Fredriksen2018-10-192-10/+0
|\ \ \ \ | |/ / / |/| | |