summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change prefix from /opt/yahoo/vespa to /opt/vespa.Tor Egge2017-06-097-18/+18
* Merge pull request #2683 from yahoo/balder/depend-on-generated-configArnstein Ressem2017-06-091-0/+1
|\
| * Depend on the generated config library.Henning Baldersheim2017-06-091-0/+1
|/
* Merge pull request #2677 from yahoo/mortent/node-repo-rest-api-additionalipsTorbjørn Smørgrav2017-06-093-3/+16
|\
| * Read additionalIpAddresses when adding nodesMorten Tokle2017-06-083-3/+16
* | Merge pull request #2682 from yahoo/yngveaasheim/use-16-distribution-bits-in-...Jon Bratseth2017-06-091-0/+1
|\ \
| * | [VESPA-5826] 16 distribution bits in us-east-3Yngve Aasheim2017-06-091-0/+1
|/ /
* | Merge pull request #2680 from yahoo/revert-2675-revert-2672-revert-2445-gjora...gjoranv2017-06-092-20/+52
|\ \
| * | Revert "Revert "Revert "Gjoranv/remove default ctor4"""Harald Musum2017-06-082-20/+52
|/ /
* | Merge pull request #2678 from yahoo/kkraune/versionArnstein Ressem2017-06-081-1/+1
|\ \
| * | add note on versionKristian Aune2017-06-081-1/+1
|/ /
* | Merge pull request #2668 from yahoo/geirst/rename-binaries-in-fnetGeir Storli2017-06-086-17/+23
|\ \ | |/ |/|
| * Rename binaries in fnet to use vespa- prefix.Geir Storli2017-06-086-17/+23
* | Merge pull request #2676 from yahoo/andreer/fix-and-explain-builddir-vs-sourc...Arnstein Ressem2017-06-081-1/+3
|\ \
| * | fix and explain sourcedir vs builddirAndreas Eriksen2017-06-081-1/+3
|/ /
* | Merge pull request #2674 from yahoo/hmusum/wait-until-all-applications-redepl...Jon Bratseth2017-06-082-4/+9
|\ \
| * | Wait until all applications have been redeployedHarald Musum2017-06-082-4/+9
* | | Merge pull request #2658 from yahoo/bjorncs/proper-vespa-home-handlingBjørn Christian Seime2017-06-0811-18/+533
|\ \ \
| * | | Add correct VESPA_HOME resolving + add copyright headerBjørn Christian Seime2017-06-0711-18/+533
* | | | Merge pull request #2675 from yahoo/revert-2672-revert-2445-gjoranv/remove-de...gjoranv2017-06-082-52/+20
|\ \ \ \
| * | | | Revert "Revert "Gjoranv/remove default ctor4""gjoranv2017-06-082-52/+20
|/ / / /
* | | | Merge pull request #2673 from yahoo/gjoranv/add-zone-to-container-configHarald Musum2017-06-081-1/+2
|\ \ \ \
| * | | | Add a Zone component to services config.gjoranv2017-06-081-1/+2
* | | | | Merge pull request #2672 from yahoo/revert-2445-gjoranv/remove-default-ctor4Arnstein Ressem2017-06-082-20/+52
|\ \ \ \ \
| * | | | | Revert "Gjoranv/remove default ctor4"Harald Musum2017-06-082-20/+52
|/ / / / /
* | | | | Merge pull request #2671 from yahoo/arnej/less-trailing-slashHenning Baldersheim2017-06-0814-14/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | avoid trailing slash in ROOT settingArne H Juul2017-06-0814-14/+14
| |/ / /
* | | | Merge pull request #2669 from yahoo/arnej/rewrite-start-cbinariesHenning Baldersheim2017-06-081-137/+87
|\ \ \ \ | |/ / / |/| | |
| * | | refactorArne H Juul2017-06-081-137/+87
* | | | Merge pull request #2670 from yahoo/arnej/less-hardcoded-yahooJon Bratseth2017-06-0810-16/+66
|\ \ \ \
| * | | | use VESPA_USER env varArne H Juul2017-06-082-4/+7
| * | | | use vespaUser() from DefaultsArne H Juul2017-06-082-7/+7
| * | | | use vespaUser() from DefaultsArne H Juul2017-06-081-2/+2
| * | | | make API for getting VESPA_USER settingArne H Juul2017-06-085-3/+50
* | | | | Merge pull request #2664 from yahoo/bratseth/nonfunctional-changesArne H Juul2017-06-0811-41/+116
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge with masterJon Bratseth2017-06-08630-4535/+11939
| |\ \ \ \
| * | | | | Nonfunctional changesJon Bratseth2017-06-0811-41/+116
* | | | | | Merge pull request #2667 from yahoo/freva/add-list-containersHarald Musum2017-06-0810-32/+61
|\ \ \ \ \ \
| * | | | | | Use scheduleWithFixedDelay instead of scheduleAtFixedRatevalerijf2017-06-081-2/+2
| * | | | | | Use listContainers in NodeAdminImplvalerijf2017-06-087-29/+48
| * | | | | | Add listAllContainersManagedBy() method to DockerImplvalerijf2017-06-083-1/+11
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2665 from yahoo/smorgrav/move_flavor_builderTorbjørn Smørgrav2017-06-0822-21/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Move FlavorConfigBuilder from testutils to make it osgi visibletoby2017-06-0822-21/+14
| |/ / / /
* | | | | Merge pull request #2666 from yahoo/revert-2663-geirst/rename-binaries-in-fnetArnstein Ressem2017-06-083-12/+6
|\ \ \ \ \
| * | | | | Revert "Rename binaries in fnet to use vespa- prefix."Harald Musum2017-06-083-12/+6
|/ / / / /
* | | | | Merge pull request #2656 from yahoo/bjorncs/improve-activecontainer-destructBjørn Christian Seime2017-06-0810-202/+228
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use a single thread to monitor all deactivated ActiveContainersBjørn Christian Seime2017-06-089-201/+226
| * | | | Improve error message when ActiveContainer is destructed through finalizerBjørn Christian Seime2017-06-081-1/+2
|/ / / /
* | | | Merge pull request #2445 from yahoo/gjoranv/remove-default-ctor4gjoranv2017-06-082-52/+20
|\ \ \ \
| * | | | Do not create a config instance with the default ctor.gjoranv2017-05-111-49/+11