summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename config programs to have vespa- prefix.Tor Egge2017-06-0919-20/+27
* Merge pull request #2689 from yahoo/bratseth/correct-java-buildArnstein Ressem2017-06-093-3/+3
|\
| * Describe how to build all Java modulesJon Bratseth2017-06-091-1/+2
| * Nonfunctional changesJon Bratseth2017-06-092-2/+1
* | Merge pull request #2662 from yahoo/balder/wait-for-data-availabilityHenning Baldersheim2017-06-093-47/+66
|\ \
| * | Assert instead of eternal loop.Henning Baldersheim2017-06-091-1/+3
| * | Use consistent naming and the magic -1 at the magic place.Henning Baldersheim2017-06-092-6/+6
| * | Hold the guard the whole time and use double checked locking.Henning Baldersheim2017-06-092-10/+19
| * | Use a lock to guard at racing the update of the file object when while is gro...Henning Baldersheim2017-06-093-43/+56
| * | Must wait until data are visible through the filesystem.Henning Baldersheim2017-06-081-7/+2
* | | Merge pull request #2681 from yahoo/balder/restart-on-messagebus-port-changeTor Brede Vekterli2017-06-0997-721/+546
|\ \ \
| * | | mbus -> rpc in message.Henning Baldersheim2017-06-091-1/+1
| * | | Use std::make_unique.Henning Baldersheim2017-06-091-34/+14
| * | | If ports change, request shutdown.Henning Baldersheim2017-06-093-2/+23
| * | | release -> std::moveHenning Baldersheim2017-06-091-42/+29
| * | | Whitespace onlyHenning Baldersheim2017-06-082-157/+76
| * | | Reduce exposure to config internals.Henning Baldersheim2017-06-0840-77/+97
| * | | Include exceptions too.Henning Baldersheim2017-06-081-0/+1
| * | | Only include what you really needHenning Baldersheim2017-06-0858-418/+315
* | | | Merge pull request #2685 from yahoo/toregge/change-prefix-from-opt-yahoo-vesp...Arnstein Ressem2017-06-097-18/+18
|\ \ \ \
| * | | | Change prefix from /opt/yahoo/vespa to /opt/vespa.Tor Egge2017-06-097-18/+18
* | | | | Merge pull request #2688 from yahoo/hmusum/rewrite-testBjørn Christian Seime2017-06-091-3/+3
|\ \ \ \ \
| * | | | | Rewrite test so that it works even when running as rootHarald Musum2017-06-091-3/+3
| |/ / / /
* | | | | Merge pull request #2686 from yahoo/toregge/rename-config-model-programsGeir Storli2017-06-096-14/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename config-model programs to have vespa- prefix.Tor Egge2017-06-096-14/+20
|/ / / /
* | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |