summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Forward declare DocumentType.Henning Baldersheim2017-06-0619-36/+66
* Remove unused includesHenning Baldersheim2017-06-061-2/+0
* Include stringfmt where it was needed.Henning Baldersheim2017-06-0688-74/+135
* Also forward declare slime::CursorHenning Baldersheim2017-06-061-0/+1
* Also forward declare slime::Inspector.Henning Baldersheim2017-06-061-0/+3
* Use forward declarations to reduce included footprintHenning Baldersheim2017-06-061-17/+24
* Merge pull request #2622 from yahoo/revert-2620-revert-2617-revert-2616-rever...Jon Bratseth2017-06-056-76/+248
|\
| * Add more backwards compatibilityJon Bratseth2017-06-051-1/+6
| * Revert "Revert "Revert "Revert "Bratseth/deployment delay""""Jon Bratseth2017-06-056-77/+244
|/
* Merge pull request #2620 from yahoo/revert-2617-revert-2616-revert-2604-brats...Martin Polden2017-06-036-244/+77
|\
| * Revert "Revert "Revert "Bratseth/deployment delay"""Harald Musum2017-06-036-244/+77
|/
* Merge pull request #2619 from yahoo/gjoranv/put-back-queries-metricgjoranv2017-06-031-0/+1
|\
| * Re-add 'queries' metric removed by accident.gjoranv2017-06-031-0/+1
|/
* Merge pull request #2618 from yahoo/freva/ignore-unstable-testHarald Musum2017-06-021-0/+2
|\
| * Ignore unstable testvalerijf2017-06-021-0/+2
* | Merge pull request #2617 from yahoo/revert-2616-revert-2604-bratseth/deployme...Martin Polden2017-06-026-77/+244
|\ \ | |/ |/|
| * Maintain backwards compatibility with earlier config modelsJon Bratseth2017-06-023-22/+30
| * Revert "Revert "Bratseth/deployment delay""Jon Bratseth2017-06-026-78/+237
* | Merge pull request #2615 from yahoo/ldalves/default-vespa-metricsgjoranv2017-06-024-7/+43
|\ \
| * | add a static import for 'singleton'Leandro Alves2017-06-022-2/+4
| * | add default vespa metrics to custom consumersLeandro Alves2017-06-024-6/+40
* | | Merge pull request #2614 from yahoo/arnej/plug-one-llvm-leakHåvard Pettersen2017-06-021-0/+1
|\ \ \ | |_|/ |/| |
| * | cleanup a global mutexArne H Juul2017-06-021-0/+1
* | | Merge pull request #2616 from yahoo/revert-2604-bratseth/deployment-delayJon Bratseth2017-06-026-237/+78
|\ \ \
| * | | Revert "Bratseth/deployment delay"Jon Bratseth2017-06-026-237/+78
|/ / /
* | | Merge pull request #2607 from yahoo/balder/remove-storageframework.h-from-hea...Tor Brede Vekterli2017-06-02102-296/+206
|\ \ \ | |_|/ |/| |
| * | Removed storageframework.h from header files.Henning Baldersheim2017-06-01102-296/+206
* | | Merge pull request #2613 from yahoo/freva/add-nodectl-instanceHarald Musum2017-06-021-0/+191
|\ \ \
| * | | Add nodectl-instancevalerijf2017-06-021-0/+191
| | |/ | |/|
* | | Merge pull request #2610 from yahoo/balder/restart-on-listen-failureHåvard Pettersen2017-06-021-6/+4
|\ \ \ | |/ / |/| |
| * | If we fail to listen on a port we just throw an PortlistenException and restart.Henning Baldersheim2017-06-011-6/+4
* | | Merge pull request #2589 from yahoo/freva/fix-local-zoneHarald Musum2017-06-0233-1011/+57
|\ \ \
| * | | Small change to re-trigger yahooclavalerijf2017-06-021-1/+1
| * | | Remove basic-search-for-docker app, use sample-app/blog-search insteadvalerijf2017-05-3119-603/+4
| * | | Run local zone without building local imagevalerijf2017-05-3110-385/+25
| * | | Set isRunningLocally through environment variable instead of NodeAdminConfigvalerijf2017-05-314-23/+28
* | | | Merge pull request #2604 from yahoo/bratseth/deployment-delayMartin Polden2017-06-026-78/+237
|\ \ \ \ | |_|/ / |/| | |
| * | | Actually parse long. Ensure unique deploymentsJon Bratseth2017-06-022-3/+23
| * | | Allow delay in deployment schemaJon Bratseth2017-06-012-8/+18
| * | | Validate max total delayJon Bratseth2017-06-013-27/+67
| * | | Parse delayJon Bratseth2017-06-012-14/+33
| * | | Allow delay steps in modelJon Bratseth2017-06-013-47/+62
| * | | Add required steps at constructionJon Bratseth2017-06-013-41/+96
* | | | Merge pull request #2608 from yahoo/gjoranv/refactor-vespa-metric-setgjoranv2017-06-013-11/+9
|\ \ \ \
| * | | | Refactor VespaMetricSet to have a MetricSet instead of be one.gjoranv2017-06-013-11/+9
| | |_|/ | |/| |
* | | | Merge pull request #2609 from yahoo/balder/create-supervisorHenning Baldersheim2017-06-011-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Create supervisor tooHenning Baldersheim2017-06-011-1/+1
|/ / /
* | | Merge pull request #2602 from yahoo/gjoranv/system-metric-setgjoranv2017-06-016-5/+97
|\ \ \
| * | | Add the 'system' metric set to all custom consumers.gjoranv2017-06-012-4/+15
| * | | Add unit test.gjoranv2017-06-011-0/+17