aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2494 from yahoo/hakon/adds-safe-setting-of-wanted-state-downhakonhall2017-05-235-46/+256
|\
| * Extract common checkHåkon Hallingstad2017-05-212-23/+31
| * Dedup test codeHåkon Hallingstad2017-05-211-64/+46
| * Verify version and reported stateHåkon Hallingstad2017-05-212-11/+76
| * Safely set storage node to DOWNHåkon Hallingstad2017-05-185-33/+188
* | Merge pull request #2522 from yahoo/hmusum/do-not-mount-start-services.outhakonhall2017-05-231-1/+0
|\ \
| * | Not needed to mount start-services.out anymore, it is in logs/vespa nowHarald Musum2017-05-221-1/+0
* | | Merge pull request #2523 from yahoo/revert-2520-toregge/proton-config-reporti...Henning Baldersheim2017-05-229-42/+44
|\ \ \ | |/ / |/| |
| * | Revert "Toregge/proton config reporting cleanup"Harald Musum2017-05-229-42/+44
|/ /
* | Merge pull request #2518 from yahoo/vekterli/zk-writes-must-be-timing-invariantTor Brede Vekterli2017-05-222-4/+16
|\ \
| * | Don't reset interrupt flagTor Brede Vekterli2017-05-221-1/+0
| * | Write to ZooKeeper must be timing invariantTor Brede Vekterli2017-05-222-4/+17
* | | Merge pull request #2520 from yahoo/toregge/proton-config-reporting-cleanupTor Brede Vekterli2017-05-229-44/+42
|\ \ \
| * | | Simplify.Tor Egge2017-05-221-2/+1
| * | | Report min of service layer config generation and proton config generationTor Egge2017-05-222-11/+9
| * | | Reduce number of component configs reported by proton.Tor Egge2017-05-228-31/+32
* | | | Merge pull request #2475 from yahoo/bjorncs/remove-manhattan-integrationgjoranv2017-05-228-400/+56
|\ \ \ \
| * | | | Deprecate Manhattan metricsBjørn Christian Seime2017-05-164-22/+30
| * | | | Remove Manhattan integrationBjørn Christian Seime2017-05-164-378/+26
* | | | | Merge pull request #2486 from yahoo/bjorncs/jmxgjoranv2017-05-225-0/+43
|\ \ \ \ \
| * | | | | Add support for inspecting Jetty metrics through JMXBjørn Christian Seime2017-05-182-0/+33
| * | | | | Add jetty-jmx dependencyBjørn Christian Seime2017-05-163-0/+10
* | | | | | Merge pull request #2519 from yahoo/smorgrav/groupprepare_refactorJon Bratseth2017-05-222-254/+268
|\ \ \ \ \ \
| * | | | | | Replace NodeList with the refactored NodeAllocation classtoby2017-05-221-254/+18
| * | | | | | Extract NodeList to standalone class called NodeAllocationtoby2017-05-221-0/+250
* | | | | | | Merge pull request #2489 from yahoo/freva/freeze-node-agents-before-orchestra...Valerij Fredriksen2017-05-223-11/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Initialize mocks before calling anythingvalerijf2017-05-193-11/+20
* | | | | | | Merge pull request #2516 from yahoo/freva/set-vespa-version-from-wanted-vespa...Harald Musum2017-05-228-90/+86
|\ \ \ \ \ \ \
| * | | | | | | Set vespaVersion in node-repo to be the same as wantedVespaVersionvalerijf2017-05-228-90/+86
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #2449 from yahoo/freva/feed-metricsValerij Fredriksen2017-05-2223-65/+246
|\ \ \ \ \ \ \
| * | | | | | | Code review fixesvalerijf2017-05-1211-53/+60
| * | | | | | | Add feed metrics to VespaMetricSetvalerijf2017-05-111-5/+7
| * | | | | | | Arch. review fixesvalerijf2017-05-115-10/+9
| * | | | | | | Fix testsvalerijf2017-05-118-9/+18
| * | | | | | | Update feed metrics in vespa.http.servervalerijf2017-05-113-11/+28
| * | | | | | | Set DocumentOperationType in ReplyContextvalerijf2017-05-114-15/+20
| * | | | | | | Report feed metrics against /document/v1valerijf2017-05-112-22/+52
| * | | | | | | Created helper classes to collect feed metricsvalerijf2017-05-113-0/+112
* | | | | | | | Merge pull request #2517 from yahoo/hmusum/mount-start-services.outValerij Fredriksen2017-05-222-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Mount logs/start-services.outHarald Musum2017-05-222-0/+2
* | | | | | | | | Merge pull request #2515 from yahoo/mortent/feature-toggle-dynamic-docker-all...Torbjørn Smørgrav2017-05-222-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Feature toggle to enable dynamic docker allocationMorten Tokle2017-05-222-1/+17
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2507 from yahoo/smorgrav/patch_additional_ipsJon Bratseth2017-05-221-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Enable patching of additional IP addressestoby2017-05-191-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #2514 from yahoo/freva/network-namespace-command-timeoutHarald Musum2017-05-222-57/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Make network namespace command execute through docker-api with timeoutvalerijf2017-05-222-57/+26
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2513 from yahoo/hmusum/less-logginggjoranv2017-05-221-18/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Less logging at debug levelHarald Musum2017-05-221-18/+12
|/ / / / / / /
* | | | | | | Merge pull request #2512 from yahoo/revert-2493-gjoranv/component-constructionMorten Tokle2017-05-225-219/+68
|\ \ \ \ \ \ \
| * | | | | | | Revert "Gjoranv/component construction"Harald Musum2017-05-225-219/+68
|/ / / / / / /