summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use std::mutex and std::condition_variable instead of FastOS_CondTor Egge2017-10-272-11/+14
* Use std::mutex and std::condition_variable instead of FastOS_CondTor Egge2017-10-272-52/+20
* Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-276-126/+90
* Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-52/+44
* Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-271-9/+10
* Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-64/+52
* Merge pull request #3920 from vespa-engine/toregge/use-standard-locksHenning Baldersheim2017-10-2737-743/+590
|\
| * Use std::mutex instead of FastOS_Mutex.Tor Egge2017-10-271-15/+15
| * Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-8/+10
| * Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-45/+46
| * Reduce use of FastOS_Mutex and FastOS_Cond.Tor Egge2017-10-278-286/+158
| * Mutex instrumentation is long gone.Tor Egge2017-10-277-8/+8
| * Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-271-8/+12
| * Remove unneeded include statements.Tor Egge2017-10-272-2/+0
| * Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-22/+20
| * Use std::mutex and std::condition_variable instead of FastOS_Cond.Tor Egge2017-10-272-10/+10
| * Use std::unique_lock<std::mutex> to guard node manager.Tor Egge2017-10-272-66/+50
| * Use std::unique_lock<std::mutex> to guard fnet search.Tor Egge2017-10-272-76/+85
| * Use std::unique_lock<std::mutex> to guard engine.Tor Egge2017-10-274-31/+30
| * Use std::atomic<int> instead of a mutex protected int to protect againstTor Egge2017-10-272-21/+6
| * Use std::unique_lock<std::mutex> to guard data set.Tor Egge2017-10-2711-145/+140
* | Merge pull request #3921 from vespa-engine/havardpe/clean-up-operation-classesArne H Juul2017-10-2716-476/+178
|\ \
| * | remove no longer needed operation abstractionsHåvard Pettersen2017-10-2716-476/+178
| |/
* | Merge pull request #3916 from vespa-engine/hakonhall/remove-unused-gethostres...Bjørn Christian Seime2017-10-271-8/+0
|\ \
| * | Remove unused GetHostResponse constructorHåkon Hallingstad2017-10-271-8/+0
* | | Merge pull request #3914 from vespa-engine/mortent/simplify-identitygjoranv2017-10-275-21/+11
|\ \ \ | |_|/ |/| |
| * | Simplify identity configurationMorten Tokle2017-10-275-21/+11
| |/
* | Merge pull request #3904 from vespa-engine/havardpe/tensor-cleanupHåvard Pettersen2017-10-2718-293/+208
|\ \
| * | normalize to fewer operation primitivesHåvard Pettersen2017-10-262-108/+124
| * | add whitespaceHåvard Pettersen2017-10-261-15/+15
| * | remove TensorSum (use more generic TensorReduce instead)Håvard Pettersen2017-10-2617-156/+36
| * | test both reference and production tensor enginesHåvard Pettersen2017-10-261-16/+31
| * | it is not allowed to reduce over a non-existing dimensionHåvard Pettersen2017-10-261-3/+7
* | | Merge pull request #3873 from vespa-engine/jvenstad/expose-property-info-in-a...Jon Marius Venstad2017-10-2731-920/+828
|\ \ \
| * | | Included property info with tenant repliesJon Marius Venstad2017-10-276-48/+52
| * | | Updated test fiel tooJon Marius Venstad2017-10-261-3/+3
| * | | toString -> displayNameJon Marius Venstad2017-10-261-1/+1
| * | | Comments taken into accountJon Marius Venstad2017-10-2611-31/+55
| * | | Oops, forgot test responseJon Marius Venstad2017-10-251-0/+13
| * | | Add missing copyright headersJon Marius Venstad2017-10-252-0/+2
| * | | Merge branch 'master' into jvenstad/expose-property-info-in-application-apiJon Marius Venstad2017-10-2512-37/+300
| |\ \ \
| * | | | Expose property relevant URIs and contact lists at tenant/{tenant}/propertyJon Marius Venstad2017-10-255-15/+73
| * | | | Resolved ocnflictsJon Marius Venstad2017-10-24892-18555/+15629
| |\ \ \ \
| * | | | | Adjustments, mock and testsJon Marius Venstad2017-10-247-68/+243
| * | | | | Refactored deployment issues >_<Jon Marius Venstad2017-10-2025-980/+542
| * | | | | Merge master to get good unit testsJon Marius Venstad2017-10-07224-1785/+3360
| |\ \ \ \ \
| * | | | | | Add comment, commit to popJon Marius Venstad2017-10-061-0/+1
| * | | | | | Cohere to local conventions, and protected constructor just in caseJon Marius Venstad2017-10-061-12/+12
| * | | | | | Add interface to replace Issues, Contacts, PropertiesJon Marius Venstad2017-10-061-0/+67
* | | | | | | Merge pull request #3915 from vespa-engine/hmusum/use-already-existing-activa...Jon Bratseth2017-10-2710-50/+20
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |