summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #10040 from vespa-engine/bjorncs/configserver-httpsBjørn Christian Seime2019-07-157-14/+130
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improve comment in pom.xmlBjørn Christian Seime2019-07-151-1/+1
| * | | | | | Use VespaClientBuilderFactory in StateResourceBjørn Christian Seime2019-07-152-11/+21
| * | | | | | Use VespaClientBuilderFactory in ConfigConvergenceCheckerBjørn Christian Seime2019-07-152-3/+20
| * | | | | | Add factory for Vespa TLS enabled JAX-RS client buildersBjørn Christian Seime2019-07-153-0/+89
* | | | | | | Merge pull request #10039 from vespa-engine/hakonhall/map-varrun-while-apps-a...Harald Musum2019-07-151-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Map var/run while apps are migrating offHåkon Hallingstad2019-07-151-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #10036 from vespa-engine/hmusum/remove-unused-codeHåkon Hallingstad2019-07-152-99/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove unused codeHarald Musum2019-07-152-99/+3
| |/ / / / /
* | | | | | Merge pull request #10037 from vespa-engine/revert-10017-geirst/stricter-vali...Harald Musum2019-07-152-51/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Setting attribute on a field that has struct or map sub-type(s) is no...Harald Musum2019-07-152-51/+0
|/ / / / /
* | | | | Merge pull request #10035 from vespa-engine/mpolden/revert-flags-decouplingMartin Polden2019-07-1225-360/+144
|\ \ \ \ \
| * | | | | Revert "Decouple flags REST API from config server"Martin Polden2019-07-1220-261/+136
| * | | | | Revert "Audit log /flags/v1 on controller"Martin Polden2019-07-124-93/+1
| * | | | | Revert "Fix flags dependency scope"Martin Polden2019-07-121-6/+7
* | | | | | Merge pull request #10034 from vespa-engine/havardpe/allow-default-tls-in-fbenchHåvard Pettersen2019-07-122-6/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | added option to use default crypto engine as fallbackHåvard Pettersen2019-07-122-6/+17
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10033 from vespa-engine/mpolden/fix-scopeMartin Polden2019-07-121-7/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix flags dependency scopeMartin Polden2019-07-121-7/+6
|/ / / /
* | | | Merge pull request #10031 from vespa-engine/freva/phrasingMartin Polden2019-07-121-3/+3
|\ \ \ \
| * | | | Document path persistenceValerij Fredriksen2019-07-121-3/+3
* | | | | Merge pull request #10026 from vespa-engine/vekterli/cas-guard-state-version-...Tor Brede Vekterli2019-07-125-68/+170
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Guard critical cluster state version ZK writes with an atomic CaSTor Brede Vekterli2019-07-115-68/+170
| |/ / /
* | | | Merge pull request #10030 from vespa-engine/mgimle/remove-noderetirer-enumsValerij Fredriksen2019-07-123-4/+2
|\ \ \ \
| * | | | Removed Agent enums pertaining to the now-removed NodeRetirermgimle2019-07-123-4/+2
* | | | | Merge pull request #10029 from vespa-engine/hmusum/config-proxy-refactoring-2Valerij Fredriksen2019-07-124-72/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Simplify ModeHarald Musum2019-07-123-65/+9
| * | | | Merge branch 'master' into hmusum/config-proxy-refactoring-2Harald Musum2019-07-1233-392/+371
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #10028 from vespa-engine/musum/remove-event-logging-in-con...Harald Musum2019-07-126-175/+15
|\ \ \ \ \
| * | | | | Remove event logging from config proxyHarald Musum2019-07-126-175/+15
* | | | | | Merge pull request #10027 from vespa-engine/mpolden/decouple-flags-apiMartin Polden2019-07-1224-137/+354
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Audit log /flags/v1 on controllerMartin Polden2019-07-124-1/+93
| * | | | | Decouple flags REST API from config serverMartin Polden2019-07-1220-136/+261
| | |/ / / | |/| | |
* | | | | Merge pull request #10024 from vespa-engine/mpolden/remove-feature-flagMartin Polden2019-07-111-7/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove disable-chef feature flagMartin Polden2019-07-111-7/+0
| |/ / /
* | | | Merge pull request #10023 from vespa-engine/ogronnesby/remove-old-rotation-fi...Martin Polden2019-07-112-75/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove two unused methodsØyvind Grønnesby2019-07-111-17/+0
| * | | Do not read legacy rotation/endpoint fieldsØyvind Grønnesby2019-07-112-58/+2
|/ / /
| * / Create DelayedResponses in one placeHarald Musum2019-07-111-10/+6
|/ /
* | Merge pull request #10020 from vespa-engine/mpolden/fix-status-checkMartin Polden2019-07-112-41/+28
|\ \
| * | Fix convergence check of non-native systemd servicesMartin Polden2019-07-112-41/+28
* | | Merge pull request #10022 from vespa-engine/gjoranv/replace-jdisc-with-containergjoranv2019-07-1136-113/+113
|\ \ \
| * | | Replace 'jdisc' with 'container' in vespaclient-container-plugingjoranv2019-07-112-4/+4
| * | | Replace 'jdisc' with 'container' in standalone-conatainergjoranv2019-07-112-5/+5
| * | | Replace 'jdisc' with 'container' in orchestratorgjoranv2019-07-111-2/+2
| * | | Replace 'jdisc' with 'container' in node-repositorygjoranv2019-07-112-4/+4
| * | | Replace 'jdisc' with 'container' in controller-servergjoranv2019-07-113-6/+6
| * | | Replace 'jdisc' with 'container' in container-integration-testgjoranv2019-07-111-2/+2
| * | | Replace 'jdisc' with 'container' in configservergjoranv2019-07-1113-28/+28
| * | | Replace 'jdisc' with 'container' in config-application-packagegjoranv2019-07-115-32/+32