Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #2658 from yahoo/bjorncs/proper-vespa-home-handling | Bjørn Christian Seime | 2017-06-08 | 11 | -18/+533 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add correct VESPA_HOME resolving + add copyright header | Bjørn Christian Seime | 2017-06-07 | 11 | -18/+533 | |
* | | | | | | Merge pull request #2675 from yahoo/revert-2672-revert-2445-gjoranv/remove-de... | gjoranv | 2017-06-08 | 2 | -52/+20 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Revert "Gjoranv/remove default ctor4"" | gjoranv | 2017-06-08 | 2 | -52/+20 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2673 from yahoo/gjoranv/add-zone-to-container-config | Harald Musum | 2017-06-08 | 1 | -1/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a Zone component to services config. | gjoranv | 2017-06-08 | 1 | -1/+2 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #2672 from yahoo/revert-2445-gjoranv/remove-default-ctor4 | Arnstein Ressem | 2017-06-08 | 2 | -20/+52 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Gjoranv/remove default ctor4" | Harald Musum | 2017-06-08 | 2 | -20/+52 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2671 from yahoo/arnej/less-trailing-slash | Henning Baldersheim | 2017-06-08 | 14 | -14/+14 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | avoid trailing slash in ROOT setting | Arne H Juul | 2017-06-08 | 14 | -14/+14 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2669 from yahoo/arnej/rewrite-start-cbinaries | Henning Baldersheim | 2017-06-08 | 1 | -137/+87 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | refactor | Arne H Juul | 2017-06-08 | 1 | -137/+87 | |
* | | | | | Merge pull request #2670 from yahoo/arnej/less-hardcoded-yahoo | Jon Bratseth | 2017-06-08 | 10 | -16/+66 | |
|\ \ \ \ \ | ||||||
| * | | | | | use VESPA_USER env var | Arne H Juul | 2017-06-08 | 2 | -4/+7 | |
| * | | | | | use vespaUser() from Defaults | Arne H Juul | 2017-06-08 | 2 | -7/+7 | |
| * | | | | | use vespaUser() from Defaults | Arne H Juul | 2017-06-08 | 1 | -2/+2 | |
| * | | | | | make API for getting VESPA_USER setting | Arne H Juul | 2017-06-08 | 5 | -3/+50 | |
* | | | | | | Merge pull request #2664 from yahoo/bratseth/nonfunctional-changes | Arne H Juul | 2017-06-08 | 11 | -41/+116 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Merge with master | Jon Bratseth | 2017-06-08 | 630 | -4535/+11939 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Nonfunctional changes | Jon Bratseth | 2017-06-08 | 11 | -41/+116 | |
* | | | | | | | Merge pull request #2667 from yahoo/freva/add-list-containers | Harald Musum | 2017-06-08 | 10 | -32/+61 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use scheduleWithFixedDelay instead of scheduleAtFixedRate | valerijf | 2017-06-08 | 1 | -2/+2 | |
| * | | | | | | | Use listContainers in NodeAdminImpl | valerijf | 2017-06-08 | 7 | -29/+48 | |
| * | | | | | | | Add listAllContainersManagedBy() method to DockerImpl | valerijf | 2017-06-08 | 3 | -1/+11 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2665 from yahoo/smorgrav/move_flavor_builder | Torbjørn Smørgrav | 2017-06-08 | 22 | -21/+14 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Move FlavorConfigBuilder from testutils to make it osgi visible | toby | 2017-06-08 | 22 | -21/+14 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2666 from yahoo/revert-2663-geirst/rename-binaries-in-fnet | Arnstein Ressem | 2017-06-08 | 3 | -12/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Rename binaries in fnet to use vespa- prefix." | Harald Musum | 2017-06-08 | 3 | -12/+6 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2656 from yahoo/bjorncs/improve-activecontainer-destruct | Bjørn Christian Seime | 2017-06-08 | 10 | -202/+228 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Use a single thread to monitor all deactivated ActiveContainers | Bjørn Christian Seime | 2017-06-08 | 9 | -201/+226 | |
| * | | | | | Improve error message when ActiveContainer is destructed through finalizer | Bjørn Christian Seime | 2017-06-08 | 1 | -1/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2445 from yahoo/gjoranv/remove-default-ctor4 | gjoranv | 2017-06-08 | 2 | -52/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | Do not create a config instance with the default ctor. | gjoranv | 2017-05-11 | 1 | -49/+11 | |
| * | | | | | Remove the default ctor for the generated config classes. | gjoranv | 2017-05-10 | 1 | -3/+9 | |
* | | | | | | Merge pull request #2663 from yahoo/geirst/rename-binaries-in-fnet | Tor Egge | 2017-06-08 | 3 | -6/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Rename binaries in fnet to use vespa- prefix. | Geir Storli | 2017-06-08 | 3 | -6/+12 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #2634 from yahoo/hmusum/remove-support-for-removed-api | Harald Musum | 2017-06-08 | 1 | -9/+3 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into hmusum/remove-support-for-removed-api | Harald Musum | 2017-06-07 | 305 | -794/+7868 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Remove support for /applicaton/v1 API (removed in Vespa 6) | Harald Musum | 2017-06-06 | 1 | -9/+3 | |
* | | | | | | | | Merge pull request #2632 from yahoo/freva/url-decode-group | Valerij Fredriksen | 2017-06-08 | 2 | -3/+19 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Url decode groupname in document/v1 | valerijf | 2017-06-06 | 2 | -3/+19 | |
* | | | | | | | | Merge pull request #2654 from yahoo/toregge/rename-storageserver-binaries-fixup | Geir Storli | 2017-06-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | vespa-distributord-bin should point to vespa-storaged-bin | Tor Egge | 2017-06-07 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #2653 from yahoo/toregge/rename-memfilepersistence-binaries | Geir Storli | 2017-06-08 | 4 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Rename memfilepersistence binaries to have vespa- prefix. | Tor Egge | 2017-06-07 | 4 | -5/+10 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2637 from yahoo/hmusum/redeploy-at-bootstrap-in-parallel | Harald Musum | 2017-06-08 | 7 | -73/+99 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Deploy using a fixed size thread pool | Harald Musum | 2017-06-07 | 1 | -16/+5 | |
| * | | | | | | | | Throw exception if interrupted | Harald Musum | 2017-06-07 | 1 | -1/+1 | |
| * | | | | | | | | Redeploy application in parallel when bootstrapping | Harald Musum | 2017-06-06 | 7 | -73/+110 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2661 from yahoo/hmusum/keep-more-log-on-config-server | Harald Musum | 2017-06-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ |