summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
| * | | | | Remove the default ctor for the generated config classes.gjoranv2017-05-101-3/+9
* | | | | | Merge pull request #2663 from yahoo/geirst/rename-binaries-in-fnetTor Egge2017-06-083-6/+12
|\ \ \ \ \ \
| * | | | | | Rename binaries in fnet to use vespa- prefix.Geir Storli2017-06-083-6/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2634 from yahoo/hmusum/remove-support-for-removed-apiHarald Musum2017-06-081-9/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hmusum/remove-support-for-removed-apiHarald Musum2017-06-07305-794/+7868
| |\ \ \ \ \ \
| * | | | | | | Remove support for /applicaton/v1 API (removed in Vespa 6)Harald Musum2017-06-061-9/+3
* | | | | | | | Merge pull request #2632 from yahoo/freva/url-decode-groupValerij Fredriksen2017-06-082-3/+19
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Url decode groupname in document/v1valerijf2017-06-062-3/+19
* | | | | | | | Merge pull request #2654 from yahoo/toregge/rename-storageserver-binaries-fixupGeir Storli2017-06-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | vespa-distributord-bin should point to vespa-storaged-binTor Egge2017-06-071-1/+1
* | | | | | | | | Merge pull request #2653 from yahoo/toregge/rename-memfilepersistence-binariesGeir Storli2017-06-084-5/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename memfilepersistence binaries to have vespa- prefix.Tor Egge2017-06-074-5/+10
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2637 from yahoo/hmusum/redeploy-at-bootstrap-in-parallelHarald Musum2017-06-087-73/+99
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Deploy using a fixed size thread poolHarald Musum2017-06-071-16/+5
| * | | | | | | | Throw exception if interruptedHarald Musum2017-06-071-1/+1
| * | | | | | | | Redeploy application in parallel when bootstrappingHarald Musum2017-06-067-73/+110
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2661 from yahoo/hmusum/keep-more-log-on-config-serverHarald Musum2017-06-071-0/+1
|\ \ \ \ \ \ \ \