aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ignore SIGQUITArne Juul2016-06-181-0/+2
* Merge pull request #47 from yahoo/balder/make-tld-restart-on-port-changesArne H Juul2016-06-172-101/+107
|\
| * - Use vespalib::RandomGen.Henning Baldersheim2016-06-172-1/+4
| * Remove unused global variables.Henning Baldersheim2016-06-171-6/+0
| * Restart on incompatible config changes any random time within 30s.Henning Baldersheim2016-06-172-5/+47
| * Free pointers -> std::unique_ptrHenning Baldersheim2016-06-172-60/+56
| * Remove dead codeHenning Baldersheim2016-06-172-38/+9
* | Merge pull request #78 from yahoo/smorgrav/authorJon Bratseth2016-06-1713-15/+15
|\ \
| * | Revert eof newlines - not sure wht the diff was exactly but I guesstoby2016-06-172-2/+0
| * | Add eof newlines as my sed was removing some for some reasontoby2016-06-172-0/+2
| * | Replace author with github usernametoby2016-06-1713-15/+15
* | | Merge pull request #43 from yahoo/aressem/use-env-to-find-perl-instead-of-har...Arne H Juul2016-06-1715-17/+23
|\ \ \
| * | | CMakeLists.txt file should not be part of this branchArnstein Ressem2016-06-171-5/+5
| * | | Use /usr/bin/env perl instead of /usr/local/bin/perlArnstein Ressem2016-06-1716-22/+28
* | | | Merge pull request #77 from yahoo/arnej/use-class-forname-againArne H Juul2016-06-171-1/+1
|\ \ \ \
| * | | | ForceLoad must use Class.forName()Arne Juul2016-06-171-1/+1
|/ / / /
* | | | Merge pull request #64 from yahoo/geirst/tls-fixes-and-metricsHenning Baldersheim2016-06-178-31/+26
|\ \ \ \
| * | | | Add metric for tls disk usage.Geir Storli2016-06-173-1/+5
| * | | | Remove count that was wrong and misleading.Geir Storli2016-06-173-9/+0
| * | | | Fix reporting of numEntries (count).Geir Storli2016-06-171-1/+1
| * | | | Rename count -> numEntries.Geir Storli2016-06-174-20/+20
| |/ / /
* | | | Merge pull request #62 from yahoo/toregge/handle-live-memory-flush-strategy-c...Henning Baldersheim2016-06-175-69/+91
|\ \ \ \
| * | | | Don't need to restart when prepare restart flush strategy configTor Egge2016-06-171-2/+2
| * | | | No longer needs to restart when memory flush strategy config changes.Tor Egge2016-06-171-7/+7
| * | | | Handle live memory flush strategy config changes:Tor Egge2016-06-174-60/+82
* | | | | Merge pull request #37 from yahoo/toregge/fix-flushengine-prune-strategyHenning Baldersheim2016-06-1718-97/+113
|\ \ \ \ \
| * | | | | Fixup flushengine prune strategy (tls pruning).Tor Egge2016-06-1618-97/+113
* | | | | | Merge pull request #61 from yahoo/toregge/serialize-flushengine-setstrategy-c...Henning Baldersheim2016-06-171-0/+1
|\ \ \ \ \ \
| * | | | | | Take lock at start of FlushEngine::setStrategy to avoid crashTor Egge2016-06-171-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #58 from yahoo/arnej/make-Logger-a-daemon-threadHenning Baldersheim2016-06-171-0/+1
|\ \ \ \ \ \
| * | | | | | the "Logger" is a Daemon threadArne Juul2016-06-171-0/+1
* | | | | | | Merge pull request #27 from yahoo/tegge/always-update-nested-attribute-on-insertHenning Baldersheim2016-06-174-27/+83
|\ \ \ \ \ \ \
| * | | | | | | Rename variable names to improve code readability.Tor Egge2016-06-171-17/+20
| * | | | | | | Always update nested attribute when inserting new documents into document met...Tor Egge2016-06-164-14/+67
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #75 from yahoo/kkraune/remove-namesJon Bratseth2016-06-171-4/+4
|\ \ \ \ \ \ \
| * | | | | | | remove namesKristian Aune2016-06-171-4/+4
* | | | | | | | Merge pull request #74 from yahoo/aressem/allow-using-the-OpenJDK-java-vmJon Bratseth2016-06-171-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow using the 64-bit OpenJDK vm as well.Arnstein Ressem2016-06-171-2/+2
* | | | | | | | | Merge pull request #70 from yahoo/balder/gcc-5.4Henning Baldersheim2016-06-172-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing includes for gcc 5.4Henning Baldersheim2016-06-172-0/+2
* | | | | | | | | | Merge pull request #76 from yahoo/arnej/fix-forceload-apigjoranv2016-06-174-12/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | provide the right classloaderArne Juul2016-06-172-8/+6
| * | | | | | | | | ForceLoad API needs the classloader alsoArne Juul2016-06-172-4/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #72 from yahoo/aressem/rpm-add-missing-conf-directory-to-f...Eirik Nygaard2016-06-171-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add the conf directory to the rpm.Arnstein Ressem2016-06-171-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #73 from yahoo/aressem/add-mising-dependency-for-configsEirik Nygaard2016-06-171-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add dependency so that the config files will be generated before compiling test.Arnstein Ressem2016-06-171-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #69 from yahoo/hakon/to-hakonhallJon Bratseth2016-06-1739-40/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Change hakon to hakonhallHåkon Hallingstad2016-06-1739-40/+40
|/ / / / / / / /
* | | | | | | | Merge pull request #66 from yahoo/arnej/add-vespa-userEirik Nygaard2016-06-173-29/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |