summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Filter out unwanted log messages from Jersey client."gjoranv2019-11-121-26/+0
* Merge pull request #11278 from vespa-engine/balder/selection-cleanupHenning Baldersheim2019-11-1228-291/+154
|\
| * std::make_uniqueHenning Baldersheim2019-11-121-69/+48
| * Use std::make_uniqueHenning Baldersheim2019-11-122-14/+14
| * Remove unused code.Henning Baldersheim2019-11-121-2/+0
| * Remove unused code.Henning Baldersheim2019-11-121-1/+0
| * =defaultHenning Baldersheim2019-11-121-1/+1
| * Nested namespaceHenning Baldersheim2019-11-127-33/+11
| * Nested namespaceHenning Baldersheim2019-11-1215-133/+52
| * Nested namespaceHenning Baldersheim2019-11-123-11/+6
| * c++11 for loops.Henning Baldersheim2019-11-121-8/+8
| * = defaultHenning Baldersheim2019-11-122-20/+15
* | Merge pull request #11277 from vespa-engine/gjoranv/filter-jersey-client-logHÃ¥kon Hallingstad2019-11-121-0/+26
|\ \
| * | Filter out unwanted log messages from Jersey client.gjoranv2019-11-111-0/+26
* | | Merge pull request #11276 from vespa-engine/bratseth/allow-removing-half-of-c...Jon Bratseth2019-11-124-8/+14
|\ \ \
| * | | Allow removing half of the cluster controllersJon Bratseth2019-11-124-8/+14
* | | | Merge pull request #11275 from vespa-engine/hmusum/refactor-testsJon Bratseth2019-11-123-154/+146
|\ \ \ \
| * | | | Refactor tests, no functional changesHarald Musum2019-11-123-154/+146
| |/ / /
* | | | Merge pull request #11270 from vespa-engine/gjoranv/maven-plugin-version-prop...gjoranv2019-11-121-13/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add version properties for official Apache Maven pluginsgjoranv2019-11-111-13/+25
* | | | Merge pull request #11274 from vespa-engine/revert-11272-revert-11269-mortent...Morten Tokle2019-11-1213-48/+422
|\ \ \ \ | |_|/ / |/| | |
| * | | Deserialize instant using jacksonMorten Tokle2019-11-122-10/+14
| * | | Revert "Revert "Reapply #11146 Validate register and refresh""Morten Tokle2019-11-1213-47/+417
* | | | Merge pull request #11273 from vespa-engine/musum/turn-off-debuggingValerij Fredriksen2019-11-121-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Turn off debuggingHarald Musum2019-11-121-1/+1
* | | | Merge pull request #11272 from vespa-engine/revert-11269-mortent/validate-reg...Morten Tokle2019-11-1213-417/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Reapply #11146 Validate register and refresh"Morten Tokle2019-11-1213-417/+47
|/ / /
* | | Merge pull request #11269 from vespa-engine/mortent/validate-register-refreshMorten Tokle2019-11-1213-47/+417
|\ \ \
| * | | Reapply #11146 Validate register and refreshMorten Tokle2019-11-1113-47/+417
* | | | Merge pull request #11271 from vespa-engine/bratseth/hosts-cleanup-1Harald Musum2019-11-124-47/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't delegateJon Bratseth2019-11-113-10/+4
| * | | Get requested resources from HostResourcesJon Bratseth2019-11-113-18/+3
| * | | No need to patch in flavor#Jon Bratseth2019-11-111-4/+0
| * | | Construct HostResources from a HostSpecJon Bratseth2019-11-112-18/+11
|/ / /
* | | Merge pull request #11267 from vespa-engine/hmusum/create-all-needed-config-m...Jon Bratseth2019-11-114-29/+106
|\ \ \ | |_|/ |/| |
| * | Always try to build config model for old versionsHarald Musum2019-11-114-29/+106
* | | Merge pull request #11252 from vespa-engine/jvenstad/instance-orchestrationJon Marius Venstad2019-11-1116-162/+297
|\ \ \ | |/ / |/| |
| * | Replace more JobStatus usagesJon Marius Venstad2019-11-1111-75/+179
| * | Update test which assumes test jobs must waitJon Marius Venstad2019-11-111-9/+6
| * | Consider all known runs when checking whether versions are verifiedJon Marius Venstad2019-11-117-78/+112
* | | Merge pull request #11266 from vespa-engine/bratseth/allow-mode-deltaLester Solbakken2019-11-112-2/+2
|\ \ \ | |_|/ |/| |
| * | Allow more deltaJon Bratseth2019-11-112-2/+2
|/ /
* | Merge pull request #11265 from vespa-engine/jvenstad/multi-instance-deploymen...Harald Musum2019-11-113-9/+35
|\ \ | |/ |/|
| * Pick a deterministic job when there are ties for time of startJon Marius Venstad2019-11-112-3/+7
| * Revert "Revert "Add a multi-instance app in deploynent api test""Jon Marius Venstad2019-11-112-7/+29
|/
* Merge pull request #11264 from vespa-engine/toregge/block-clang-optimizationsHenning Baldersheim2019-11-101-0/+15
|\
| * Don't optimize away new/delete pairs.Tor Egge2019-11-101-0/+15
|/
* Merge pull request #11263 from vespa-engine/revert-11262-jvenstad/multi-insta...Harald Musum2019-11-092-29/+7
|\
| * Revert "Add a multi-instance app in deploynent api test"Jon Marius Venstad2019-11-092-29/+7
|/
* Merge pull request #11262 from vespa-engine/jvenstad/multi-instance-in-deploy...Harald Musum2019-11-092-7/+29
|\