summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into balder/decouple-datatype-and-fiedlvalue-some-moreHenning Baldersheim2017-06-07147-373/+6439
|\
| * Merge pull request #2650 from yahoo/aressem/add-perl-dependencyKristian Aune2017-06-072-0/+2
| |\
| | * Add runtime dependency.Arnstein Ressem2017-06-072-0/+2
| * | Merge pull request #2652 from yahoo/toregge/rename-vespalog-binariesGeir Storli2017-06-0711-17/+23
| |\ \
| | * | Rename vespalog binaries to have vespa- prefix.Tor Egge2017-06-0711-17/+23
| * | | Merge pull request #2648 from yahoo/toregge/rename-storage-binariesGeir Storli2017-06-073-10/+4
| |\ \ \
| | * | | Don't install vespa-storage-cmd.Tor Egge2017-06-071-1/+0
| | * | | Rename storage-cmd to vespa-storage-cmd.Tor Egge2017-06-073-9/+4
| * | | | Merge pull request #2651 from yahoo/hakon/avoid-activating-without-changesHarald Musum2017-06-072-1/+5
| |\ \ \ \
| | * | | | Avoid activating without changesHåkon Hallingstad2017-06-072-1/+5
| | | |/ / | | |/| |
| * | | | Merge pull request #2575 from yahoo/freva/add-wantToUprovision-flagValerij Fredriksen2017-06-0724-16/+85
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Renamed wantToUnprovision to wantToDeprovisionvalerijf2017-05-3124-52/+52
| | * | | Make sure wantToUnprovision has a default in node deserializationvalerijf2017-05-301-1/+3
| | * | | NodeRetirer to set wantToUnprovision flag when retiring a nodevalerijf2017-05-302-3/+16
| | * | | Expose wantToUnprovision through the REST APIvalerijf2017-05-3019-0/+22
| | * | | Add wantToUnprovision to Statusvalerijf2017-05-303-13/+45
| * | | | Merge pull request #2649 from yahoo/geirst/rename-binaries-in-fsaTor Egge2017-06-077-6/+11
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Rename binaries in fsa to use vespa- prefix.Geir Storli2017-06-077-6/+11
| |/ / /
| * | | Merge pull request #2647 from yahoo/toregge/rename-vespa-header-inspect-to-ve...Geir Storli2017-06-0711-25/+25
| |\ \ \
| | * | | Rename vespa-header-inspect to vespa-fileheader-inspect.Tor Egge2017-06-0711-25/+25
| * | | | Merge pull request #2646 from yahoo/toregge/rename-storageserver-binariesGeir Storli2017-06-074-4/+10
| |\ \ \ \
| | * | | | Rename storageserver binaries to have vespa- prefix.Tor Egge2017-06-074-4/+10
| * | | | | Merge pull request #2612 from yahoo/freva/do-not-update-version-unless-contai...Valerij Fredriksen2017-06-074-19/+39
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Do not update version unless container is runningvalerijf2017-06-024-19/+39
| * | | | | Merge pull request #2645 from yahoo/balder/clean-up-llvm-conditionallyHåvard Pettersen2017-06-071-0/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Add support for conditionally running available shutdown.Henning Baldersheim2017-06-071-0/+5
| * | | | | Merge pull request #2641 from yahoo/gjoranv/system-metric-namesgjoranv2017-06-071-3/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Whitelist correct non-docker metric names.gjoranv2017-06-061-3/+2
| * | | | | Merge pull request #2638 from yahoo/hakon/support-deploying-to-specific-confi...hakonhall2017-06-071-3/+14
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Support deploying to specific config serverHåkon Hallingstad2017-06-061-3/+14
| * | | | | Merge pull request #2631 from yahoo/toregge/ignore-install-manifest-txtGeir Storli2017-06-071-0/+1
| |\ \ \ \ \
| | * | | | | Ignore install_manifest.txt.Tor Egge2017-06-061-0/+1
| * | | | | | Merge pull request #2628 from yahoo/toregge/rename-loadattribute-to-vespa-att...Geir Storli2017-06-076-8/+8
| |\ \ \ \ \ \
| | * | | | | | Rename loadattribute to vespa-attribute-inspect.Tor Egge2017-06-066-8/+8
| | |/ / / / /
| * | | | | | Merge pull request #2624 from yahoo/toregge/use-example-com-instead-of-yahoo-...Geir Storli2017-06-075-64/+64
| |\ \ \ \ \ \
| | * | | | | | Use example.com instead of yahoo.com in unit tests.Tor Egge2017-06-055-64/+64
| * | | | | | | Merge pull request #2621 from yahoo/toregge/remove-expgolomb-appGeir Storli2017-06-076-184/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Update ignore file.Tor Egge2017-06-041-1/+1
| | * | | | | | | Stop installing uniform application. It has been used to selectTor Egge2017-06-041-2/+0
| | * | | | | | | Remove expgolomb app. It was a test app that has effectivelyTor Egge2017-06-044-181/+0
| * | | | | | | | Merge pull request #2642 from yahoo/toregge/rename-searchcore-binariesGeir Storli2017-06-079-13/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rename searchcore binaries to have vespa- prefix.Tor Egge2017-06-069-13/+18
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #2635 from yahoo/bjorncs/open-source-vespa-java-clientsBjørn Christian Seime2017-06-0755-0/+6120
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add vespaclient-java shell scripts to cmake install scriptBjørn Christian Seime2017-06-061-0/+10
| | * | | | | | | | Move vespaclient-java to Vespa open-sourceBjørn Christian Seime2017-06-0654-0/+6110
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Hide the system state lockHenning Baldersheim2017-06-0715-34/+43
* | | | | | | | | No default value in .cpp fileHenning Baldersheim2017-06-071-1/+1
* | | | | | | | | Hide the lockHenning Baldersheim2017-06-072-36/+38
* | | | | | | | | Hide the IdParseException a bit better.Henning Baldersheim2017-06-077-18/+28
* | | | | | | | | split log and bufferedlogHenning Baldersheim2017-06-0723-51/+43