summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Re-indent.Geir Storli2017-03-141-40/+39
* Move search::attribute::ISearchContext to searchcommon in preparation of exte...Geir Storli2017-03-144-6/+4
* Merge pull request #1996 from yahoo/bratseth/simplify-metrics-reportingJon Bratseth2017-03-1310-102/+78
|\
| * Correct toShortStringJon Bratseth2017-03-131-3/+3
| * Simplify metrics reporting using MaintainerJon Bratseth2017-03-138-102/+71
| * Add convenience methodJon Bratseth2017-03-132-0/+7
|/
* Merge pull request #1995 from yahoo/musum/fix-parse-attributesArnstein Ressem2017-03-131-1/+1
|\
| * Parse attributes field only once and in the right placeHarald Musum2017-03-131-1/+1
|/
* Merge pull request #1993 from yahoo/vekterli/dont-return-stringref-from-tempo...Henning Baldersheim2017-03-131-1/+1
|\
| * Don't return stringref to temporary bufferTor Brede Vekterli2017-03-131-1/+1
* | Merge pull request #1992 from yahoo/vekterli/clean-compile-with-winline-and-f...Henning Baldersheim2017-03-1341-79/+209
|\ \ | |/ |/|
| * Let sub parser be template arg instead of C function pointerTor Brede Vekterli2017-03-132-32/+32
| * Use explicit task functor instead of lambdaTor Brede Vekterli2017-03-132-5/+31
| * Move non-inlineable eval test functions into cpp fileTor Brede Vekterli2017-03-132-37/+51
| * Create explicit, non implicitly inlined function definitionsTor Brede Vekterli2017-03-1335-5/+95
* | Merge pull request #1985 from yahoo/balder/if-session-cache-hash-groupHåvard Pettersen2017-03-133-26/+32
|\ \
| * | If this is a session based query we use a hash on sessionid to select correct...Henning Baldersheim2017-03-103-26/+32
* | | Merge pull request #1984 from yahoo/balder/move-to-helper-classHåvard Pettersen2017-03-137-121/+147
|\ \ \
| * | | Move to helper class.Henning Baldersheim2017-03-107-121/+147
| |/ /
* | | Merge pull request #1983 from yahoo/balder/ease-readability-add-hits-intoHåvard Pettersen2017-03-131-2/+3
|\ \ \
| * | | Easy readability of merge loop.Henning Baldersheim2017-03-101-2/+3
| |/ /
* | | Merge pull request #1990 from yahoo/arnej/revert-sync-connect-2Håvard Pettersen2017-03-1316-199/+51
|\ \ \
| * | | perform async connect in same threadArne H Juul2017-03-1316-199/+51
| | |/ | |/|
* | | Merge pull request #1989 from yahoo/freva/do-not-fail-on-optional-fieldsHarald Musum2017-03-131-2/+2
|\ \ \ | |/ / |/| |
| * | Do not fail on optional argumentsvalerijf2017-03-131-2/+2
* | | Merge pull request #1987 from yahoo/hmusum/increase-timeoutArnstein Ressem2017-03-131-1/+1
|\ \ \
| * | | Increase timeoutHarald Musum2017-03-131-1/+1
| | |/ | |/|
* | | Merge pull request #1961 from yahoo/musum/stop-supporting-ipAddress-when-crea...Martin Polden2017-03-132-21/+5
|\ \ \ | |_|/ |/| |
| * | Stop supporting creation of node with ipAddressHarald Musum2017-03-082-21/+5
* | | Merge pull request #1986 from yahoo/freva/do-not-follow-sym-links-for-last-mo...Harald Musum2017-03-132-2/+16
|\ \ \ | |_|/ |/| |
| * | Do not follow symbolic links when getting last modified timevalerijf2017-03-132-2/+16
|/ /
* | Merge pull request #1982 from yahoo/hmusum/make-sure-to-subscribe-before-star...Valerij Fredriksen2017-03-105-23/+25
|\ \
| * | Make sure to subscribe before starting subscriber thread in testsHarald Musum2017-03-105-23/+25
* | | Merge pull request #1981 from yahoo/balder/inline-getrawvalues-in-fastpathHåvard Pettersen2017-03-106-50/+40
|\ \ \ | |/ / |/| |
| * | Enable inlinining of the most frequent and optimized code path.Henning Baldersheim2017-03-092-12/+17
| * | override and final.Henning Baldersheim2017-03-095-38/+23
|/ /
* | Merge pull request #1979 from yahoo/geirst/use-unique-ptr-instead-of-linked-ptrTor Egge2017-03-091-9/+9
|\ \
| * | Use unique ptr instead of linked ptr.Geir Storli2017-03-091-9/+9
* | | Merge pull request #1975 from yahoo/geirst/improve-imported-attribute-unit-testGeir Storli2017-03-092-12/+11
|\ \ \
| * | | Use std::async instead of explicit std::thread.Geir Storli2017-03-092-10/+4
| * | | Improve testing of acquireEnumGuard() by checking that guard is taken on unde...Geir Storli2017-03-091-7/+12
| |/ /
* | | Merge pull request #1978 from yahoo/toregge/add-explicit-destructor-to-search...Geir Storli2017-03-091-0/+3
|\ \ \
| * | | Add explicit destructor to searchcore proton documentdb configurer test.Tor Egge2017-03-091-0/+3
* | | | Merge pull request #1977 from yahoo/havardpe/less-linked-ptrTor Egge2017-03-093-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | use std::unique_ptr instead of vespalib::LinkedPtrHaavard2017-03-093-4/+4
* | | | Merge pull request #1976 from yahoo/dybdahl/fix-tostringHaakon Dybdahl2017-03-091-0/+10
|\ \ \ \
| * | | | Fix tostring.Haakon Dybdahl2017-03-091-0/+10
* | | | | Merge pull request #1959 from yahoo/freva/node-maintainer-rest-apiValerij Fredriksen2017-03-0912-479/+364
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed unneeded dependenciesvalerijf2017-03-091-15/+0
| * | | | Throw exception if call to node-maintainer failsvalerijf2017-03-091-2/+1