aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't use separate renderer threads in unit testsJon Bratseth2016-07-0426-35/+111
* Merge pull request #295 from yahoo/hmusum/use-full-path-to-vespa-nodectl-take-2freva2016-07-042-3/+5
|\
| * Use full path to vespa-nodectlHarald Musum2016-07-042-3/+5
* | Merge pull request #284 from yahoo/lesters/update-recommendation-sample-appThiago G. Martins2016-07-042-45/+55
|\ \
| * | Add filtering of already read items to sample app.Lester Solbakken2016-07-012-45/+55
* | | Merge pull request #293 from yahoo/bratseth/only-one-clustercontroller-per-ho...Jon Bratseth2016-07-047-27/+108
|\ \ \
| * | | Eclude containers on content nodesJon Bratseth2016-07-041-12/+24
| * | | Revert "Revert "Bratseth/only one clustercontroller per host 2""Jon Bratseth2016-07-047-26/+95
| | |/ | |/|
* | | Merge pull request #155 from yahoo/bratseth/upgrade-jettygjoranv2016-07-041-1/+1
|\ \ \ | |/ / |/| |
| * | Upgrade JettyJon Bratseth2016-07-041-1/+1
|/ /
* | Merge pull request #292 from yahoo/arnej/fix-misplaced-paren-2Arne H Juul2016-07-031-2/+2
|\ \
| * | editing error: mis-placed parenthesisarnej279592016-07-031-2/+2
|/ /
* | Merge pull request #290 from yahoo/arnej/fix-wrong-serialize-dirArne H Juul2016-07-031-1/+1
|\ \
| * | fixing warnings found a bug in the testArne H Juul2016-07-031-1/+1
|/ /
* | Merge pull request #289 from yahoo/arnej/fix-signed-comparesArne H Juul2016-07-034-8/+8
|\ \
| * | quick fix for signed-compare warningsArne H Juul2016-07-034-8/+8
|/ /
* | Merge pull request #288 from arnej27959/masterArne H Juul2016-07-039-29/+76
|\ \
| * \ Merge branch 'master' of github.com:arnej27959/vespaArne H. Juul2016-07-020-0/+0
| |\ \
| | * | avoid "unused result" warningsArne H. Juul2016-06-249-29/+76
| * | | avoid "unused result" warningsArne H. Juul2016-07-029-29/+76
* | | | Merge pull request #287 from yahoo/arnej/better-ulimit-handlingHenning Baldersheim2016-07-021-1/+11
|\ \ \ \ | |/ / / |/| | |
| * | | handle sh != bash case betterarnej279592016-07-011-1/+11
* | | | Merge pull request #286 from yahoo/revert-283-bratseth/only-one-clustercontro...Jon Bratseth2016-07-017-95/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "Bratseth/only one clustercontroller per host 2"Jon Bratseth2016-07-017-95/+26
|/ / /
* | | Merge pull request #283 from yahoo/bratseth/only-one-clustercontroller-per-ho...Jon Bratseth2016-07-017-26/+95
|\ \ \
| * | | Handle multiple cluster controller hosts mapping to the same physical hostJon Bratseth2016-07-012-6/+18
| * | | Nonfunctional changesJon Bratseth2016-06-303-14/+11
| * | | Revert "Revert "Don't use the same host for multiple cluster controllers""Jon Bratseth2016-06-303-8/+68
* | | | Merge pull request #282 from yahoo/toregge/safer-lid-space-compactionGeir Storli2016-07-011-2/+2
|\ \ \ \
| * | | | Reduce docid limit in feed view before reducing it for eachTor Egge2016-07-011-2/+2
| | |/ / | |/| |
* | | | Merge pull request #280 from yahoo/havardpe/ignore-filesGeir Storli2016-07-011-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | ignore generated binaryHaavard2016-07-011-0/+1
|/ / /
* | | Merge pull request #272 from yahoo/smorgrav/appid_conv_fixhakonhall2016-07-013-2/+24
|\ \ \
| * | | Only specialcase the known ApplicationInstanceReference that diviatestoby2016-07-011-1/+1
| * | | Fix path for clustercontroller set state api for applications.toby2016-06-301-1/+1
| * | | Relax assumption on ApplicationInstanceReference format.toby2016-06-302-1/+23
* | | | Merge pull request #279 from yahoo/havardpe/reduce-timeout-for-expected-failureGeir Storli2016-07-011-1/+1
|\ \ \ \
| * | | | use shorter timeout for something we do not expect to happenHaavard2016-07-011-1/+1
* | | | | Merge pull request #273 from yahoo/arnej/fix-exit-in-fastos-testsHÃ¥vard Pettersen2016-07-0115-877/+771
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | follow review feedbackArne H Juul2016-07-011-24/+6
| * | | | use ProgressI64 with file sizes/positionsArne H Juul2016-06-301-11/+9
| * | | | use Progress even moreArne H Juul2016-06-301-34/+34
| * | | | refactorArne H Juul2016-06-301-60/+20
| * | | | rename BaseForThreadTest -> ThreadTestBaseArne H Juul2016-06-307-10/+10
| * | | | base_thread.hpp -> thread_test_base.hppArne H Juul2016-06-307-6/+6
| * | | | jobs.h -> job.hArne H Juul2016-06-307-6/+6
| * | | | use Progress() to catch problemsArne H Juul2016-06-301-57/+33
| * | | | reindent and style-fixArne H Juul2016-06-301-803/+755
| * | | | cleanup rest of file testsArne H Juul2016-06-302-36/+53
| * | | | return 0 only if all okArne H Juul2016-06-3012-20/+29