summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4331 from vespa-engine/hmusum/handle-file-already-existingHenning Baldersheim2017-12-041-5/+19
|\
| * Handle file already exisistingHarald Musum2017-12-011-5/+19
* | Merge pull request #4322 from vespa-engine/geirst/add-more-proton-resource-li...Henning Baldersheim2017-12-048-46/+59
|\ \
| * | Add metrics on how far away from disk and memory resource limits proton is.Geir Storli2017-12-018-46/+59
* | | Merge pull request #4335 from vespa-engine/mpolden/revert-log-level-changeMorten Tokle2017-12-041-1/+1
|\ \ \
| * | | Revert "Reduce to FINER"Martin Polden2017-12-041-1/+1
* | | | Merge pull request #4326 from vespa-engine/freva/add-transitioning-stateValerij Fredriksen2017-12-042-25/+59
|\ \ \ \
| * | | | Add TRANSITIONING state in NodeAdminStateUpdaterValerij Fredriksen2017-12-012-25/+59
* | | | | Merge pull request #4332 from vespa-engine/gjoranv/split-parent3gjoranv2017-12-02110-965/+1291
|\ \ \ \ \
| * | | | | Use new version properties from container-dependency-versions.gjoranv2017-12-011-22/+22
| * | | | | Use no_aop classifier for guice.gjoranv2017-12-013-0/+3
| * | | | | Install new parent poms.gjoranv2017-12-011-1/+9
| * | | | | Move all deps using properties from container-dep-versions upgjoranv2017-12-012-37/+53
| * | | | | Split parent + container-dependency-versions from root pom.gjoranv2017-12-01109-942/+1241
|/ / / / /
* | | | | Merge pull request #4329 from vespa-engine/arnej/better-test-xw-productHåvard Pettersen2017-12-013-310/+65
|\ \ \ \ \
| * | | | | consolidate testsArne Juul2017-12-011-12/+4
| * | | | | simplify castsArne Juul2017-12-012-6/+4
| * | | | | improve testArne Juul2017-12-011-295/+60
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4330 from vespa-engine/havardpe/simplify-castingArne H Juul2017-12-011-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use static cast instead of dynamic castHåvard Pettersen2017-12-011-2/+2
|/ / / /
* | | | Merge pull request #4321 from vespa-engine/hmusum/do-not-setup-Filedistributo...gjoranv2017-12-018-65/+155
|\ \ \ \
| * | | | Do not setup a service for filedistributor when it is disabledHarald Musum2017-11-308-65/+155
* | | | | Merge pull request #4327 from vespa-engine/havardpe/recognize-and-replace-xw-...Arne H Juul2017-12-015-32/+152
|\ \ \ \ \
| * | | | | replace appropriate sub-expressions with dense xw productHåvard Pettersen2017-12-015-32/+152
* | | | | | Merge pull request #4324 from vespa-engine/vekterli/make-getbucketlistmessage...Tor Egge2017-12-012-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make GetBucketListMessage destructor explicitTor Brede Vekterli2017-12-012-0/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #4325 from vespa-engine/arnej/add-dense-xw-productHåvard Pettersen2017-12-016-0/+500
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | implement and test XW productArne Juul2017-11-306-0/+500
* | | | | Merge pull request #4323 from vespa-engine/freva/reset-wantTo-fields-on-readyMartin Polden2017-12-015-8/+62
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reset wantTo* fields with transitioning to readyValerij Fredriksen2017-12-015-8/+62
|/ / / /
* | | | Merge pull request #4317 from vespa-engine/freva/use-https-against-configserverValerij Fredriksen2017-12-0110-150/+137
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove sys.out in testValerij Fredriksen2017-11-302-14/+6
| * | | Node-Admin: Use HTTPS against config serversValerij Fredriksen2017-11-3010-138/+133
* | | | Merge pull request #4319 from vespa-engine/hmusum/remove-unused-ymon-propertyHarald Musum2017-11-3010-27/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unused ymonService propertyHarald Musum2017-11-3010-27/+1
| |/ /
* | | Merge pull request #4320 from vespa-engine/revert-4318-gjoranv/split-parent2gjoranv2017-11-30110-1275/+965
|\ \ \
| * | | Revert "Gjoranv/split parent2"gjoranv2017-11-30110-1275/+965
|/ / /
* | | Merge pull request #4318 from vespa-engine/gjoranv/split-parent2gjoranv2017-11-30110-965/+1275
|\ \ \ | |/ / |/| |
| * | Use new version properties from container-dependency-versions.gjoranv2017-11-301-22/+22
| * | Use no_aop classifier for guice.gjoranv2017-11-303-0/+3
| * | Install new parent poms.gjoranv2017-11-301-1/+9
| * | Split parent + container-dependency-versions from root pom.gjoranv2017-11-30109-942/+1241
* | | Merge pull request #4309 from vespa-engine/mpolden/move-rotation-to-applicationMartin Polden2017-11-3031-708/+747
|\ \ \ | |_|/ |/| |
| * | Move rotation to applicationMartin Polden2017-11-2930-691/+728
| * | Make ControllerDb an interfaceMartin Polden2017-11-282-19/+19
* | | Merge pull request #4312 from vespa-engine/havardpe/optimize-vector-concatArne H Juul2017-11-302-0/+43
|\ \ \ | |_|/ |/| |
| * | optimize vector concatHåvard Pettersen2017-11-292-0/+43
* | | Merge pull request #4315 from vespa-engine/hmusum/log-stacktrace-when-ioexcep...Valerij Fredriksen2017-11-301-1/+1
|\ \ \
| * | | Print stack trace when failing to write fileHarald Musum2017-11-301-1/+1
| |/ /
* | | Merge pull request #4314 from vespa-engine/hmusum/add-config-producer-to-cons...Valerij Fredriksen2017-11-303-13/+16
|\ \ \