summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Maven 3.3.9 or later is required for container-deps-enforcer."Bjørn Christian Seime2017-09-251-1/+1
| | | | This reverts commit 6d8d874f9096ea95905907e302c45e3e4db3394b.
* Revert "Use Maven 3.3"Bjørn Christian Seime2017-09-251-2/+1
| | | | This reverts commit 801c9e552228ee9bfea94d8c840461d865877957.
* Revert "Re-port to Fedora after maven requirement changes."Bjørn Christian Seime2017-09-251-4/+1
| | | | This reverts commit 7af86988aee2f0eb97b9439b2142ef56429450a8.
* Merge pull request #3528 from vespa-engine/gjoranv/allow-deps-for-maven3.0Bjørn Christian Seime2017-09-251-0/+8
|\ | | | | Temporarily allow deps that are resolved differently by maven 3.0.
| * Temporarily allow deps that are resolved differently by maven 3.0.gjoranv2017-09-251-0/+8
|/
* Merge pull request #3526 from ↵Bjørn Christian Seime2017-09-251-1/+4
|\ | | | | | | | | vespa-engine/toregge/restore-fedora-port-after-maven-requirement-change Re-port to Fedora after maven requirement changes.
| * Re-port to Fedora after maven requirement changes.Tor Egge2017-09-251-1/+4
|/
* Merge pull request #3524 from vespa-engine/bjorncs/use-maven-33gjoranv2017-09-251-1/+2
|\ | | | | Use Maven 3.3
| * Use Maven 3.3Bjørn Christian Seime2017-09-251-1/+2
| |
* | Merge pull request #3523 from vespa-engine/gjoranv/maven-versionBjørn Christian Seime2017-09-251-1/+1
|\ \ | |/ |/| Maven 3.3.9 or later is required for container-deps-enforcer.
| * Maven 3.3.9 or later is required for container-deps-enforcer.gjoranv2017-09-251-1/+1
|/
* Merge pull request #3521 from vespa-engine/balder/90-pecent-not-factor-90Henning Baldersheim2017-09-251-1/+1
|\ | | | | Ensure that we do not compress uncompressible stuff. The factory is i…
| * Ensure that we do not compress uncompressible stuff. The factory is in range ↵Henning Baldersheim2017-09-251-1/+1
|/ | | | 0.0 to 1.0
* Merge pull request #3510 from vespa-engine/hmusum/sleep-before-starting-servicesgjoranv2017-09-251-0/+2
|\ | | | | Give config server some time to come up before starting services
| * Give config server some time to come up before starting servicesHarald Musum2017-09-251-0/+2
| |
* | Merge pull request #3497 from ↵Martin Polden2017-09-2514-142/+81
|\ \ | | | | | | | | | | | | vespa-engine/mpolden/remove-self-triggering-support Remove self-triggering support
| * | Remove self-triggering supportMartin Polden2017-09-2214-142/+81
| | |
* | | Merge pull request #3519 from vespa-engine/gjoranv/enforce-container-depsBjørn Christian Seime2017-09-252-0/+119
|\ \ \ | | | | | | | | Enforce predefined set of allowed provided container deps.
| * | | Enforce predefined set of allowed provided container deps.gjoranv2017-09-252-0/+119
| | | |
* | | | Merge pull request #3518 from vespa-engine/balder/do-no-copy-more-than-you-haveHenning Baldersheim2017-09-2510-50/+28
|\ \ \ \ | | | | | | | | | | Do not copy more than you have.
| * | | | Do not copy more than you have.Henning Baldersheim2017-09-2510-50/+28
|/ / / /
* | | | Merge pull request #3512 from ↵Morten Tokle2017-09-253-1/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/ignore-pr-in-failure-redeployer Make FailureRedeployer ignore PR instances
| * | | | Make FailureRedeployer ignore PR instancesMartin Polden2017-09-253-1/+54
| |/ / /
* | | | Merge pull request #3511 from vespa-engine/freva/class-lockingValerij Fredriksen2017-09-254-0/+62
|\ \ \ \ | |/ / / |/| | | Create ClassLocking
| * | | Create ClassLockingValerij Fredriksen2017-09-254-0/+62
| | |/ | |/|
* | | Merge pull request #3491 from ↵Martin Polden2017-09-253-57/+2
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/mpolden/remove-corp-prod-special-casing Remove corp-prod special casing
| * | | Remove corp-prod special casingMartin Polden2017-09-213-57/+2
| | | |
* | | | Merge pull request #3509 from vespa-engine/freva/node-admin-stopValerij Fredriksen2017-09-2522-227/+198
|\ \ \ \ | |_|/ / |/| | | Freva/node admin stop
| * | | Moved logging to ComponentsProviderImplValerij Fredriksen2017-09-252-8/+13
| | | |
| * | | Start schedulers in start()Valerij Fredriksen2017-09-222-22/+24
| | | |
| * | | ComponentsProviderImpl to implement deconstruct and shut down everythingValerij Fredriksen2017-09-226-42/+45
| | | |
| * | | Simplify ComponentsProviderValerij Fredriksen2017-09-226-84/+49
| | | |
| * | | Re-order arguments, take converge interval as Duration insteadValerij Fredriksen2017-09-223-22/+23
| | | |
| * | | Take NodeAgent interval in constructorValerij Fredriksen2017-09-225-21/+20
| | | |
| * | | Make Orchestrator constructor same as NodeRepositoryValerij Fredriksen2017-09-222-22/+17
| | | |
| * | | Simplify NodeRepository constructorValerij Fredriksen2017-09-225-19/+20
|/ / /
* | | Merge pull request #3507 from vespa-engine/revert-3464-freva/node-admin-shutdownValerij Fredriksen2017-09-2229-322/+315
|\ \ \ | | | | | | | | Revert "Freva/node admin shutdown"
| * | | Revert "Freva/node admin shutdown"Valerij Fredriksen2017-09-2229-322/+315
|/ / /
* | | Merge pull request #3506 from ↵Valerij Fredriksen2017-09-221-3/+3
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-3502-freva/node-admin-injection-fix Revert "RestApiHandler injection fix"
| * | | Revert "RestApiHandler injection fix"Valerij Fredriksen2017-09-221-3/+3
|/ / /
* | | Merge pull request #3505 from ↵Valerij Fredriksen2017-09-221-2/+12
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-3504-freva/disable-node-admin-locks Revert "Remove node-admin locks"
| * | | Revert "Remove node-admin locks"Valerij Fredriksen2017-09-221-2/+12
|/ / /
* | | Merge pull request #3504 from vespa-engine/freva/disable-node-admin-locksValerij Fredriksen2017-09-221-12/+2
|\ \ \ | | | | | | | | Remove node-admin locks
| * | | Remove node-admin locksValerij Fredriksen2017-09-221-12/+2
|/ / /
* | | Merge pull request #3503 from vespa-engine/gjoranv/bouncycastleBjørn Christian Seime2017-09-222-1/+12
|\ \ \ | | | | | | | | Provide bouncycastle on test classpath.
| * | | Provide bouncycastle on test classpath.gjoranv2017-09-222-1/+12
|/ / /
* | | Merge pull request #3502 from vespa-engine/freva/node-admin-injection-fixhakonhall2017-09-221-3/+3
|\ \ \ | | | | | | | | RestApiHandler injection fix
| * | | RestApiHandler injection fixValerij Fredriksen2017-09-221-3/+3
| | | |
* | | | Merge pull request #3501 from ↵Martin Polden2017-09-222-4/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/always-restart-deadlocked-deployment Always restart deadlocked deployment
| * | | | Always restart deadlocked deploymentMartin Polden2017-09-222-4/+68
| |/ / /