summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed TestApp::GetSourceDirectoryArnstein Ressem2016-11-0268-215/+169
|
* Merge pull request #980 from yahoo/balder/jira-5223Geir Storli2016-11-011-5/+2
|\ | | | | Keep the readguard until docsumfetching is complete to avoid identity…
| * Keep the readguard until docsumfetching is complete to avoid identitychange ↵Henning Baldersheim2016-10-311-5/+2
| | | | | | | | or ABA issue.
* | Merge pull request #989 from yahoo/bratseth/add-temporary-activation-loggingJon Bratseth2016-11-013-9/+9
|\ \ | | | | | | Add temporary logging + whitespace fixes
| * | Add temporary logging + whitespace fixesJon Bratseth2016-11-013-9/+9
| | |
* | | Merge pull request #988 from ↵Jon Bratseth2016-11-011-1/+1
|\ \ \ | |/ / |/| | | | | | | | yahoo/balder/use-same-version-4.5-for-runtime-and-build Unify on version 4.5 on both buil and runtime.
| * | Unify on version 4.5 on both buil and runtime.Henning Baldersheim2016-11-011-1/+1
| | |
* | | Merge pull request #987 from yahoo/bratseth/more-deprecationsKristian Aune2016-11-016-308/+5
|\ \ \ | | | | | | | | Bratseth/more deprecations
| * | | Remove last traces of httpgatewayJon Bratseth2016-11-013-249/+2
| | | |
| * | | Remove dead httpgateway codeJon Bratseth2016-11-013-59/+3
| |/ /
* | | Merge pull request #985 from yahoo/bratseth/deprecationsJon Bratseth2016-11-014-1/+6
|\ \ \ | | | | | | | | Mark for deprecation
| * | | Mark for deprecationJon Bratseth2016-11-014-1/+6
| |/ /
* | | Merge pull request #986 from yahoo/hmusum/more-logging-for-activation-lockHaakon Dybdahl2016-11-012-7/+12
|\ \ \ | | | | | | | | More logging to try to debug activation locking issue
| * | | More logging to try to debug activation locking issueHarald Musum2016-11-012-7/+12
| |/ /
* | | Merge pull request #984 from yahoo/hmusum/minor-fixesHaakon Dybdahl2016-11-012-39/+8
|\ \ \ | | | | | | | | Hmusum/minor fixes
| * | | ReformatHarald Musum2016-11-011-3/+4
| | | |
| * | | Use the tenant path for the tenant we have createdHarald Musum2016-11-012-39/+7
| |/ /
* | | Merge pull request #983 from ↵Henning Baldersheim2016-11-011-18/+20
|\ \ \ | |/ / |/| | | | | | | | yahoo/balder/reduce-loglevel-and-add-some-more-final-and-braces Reduce loglevel.
| * | Reduce loglevel.Henning Baldersheim2016-11-011-18/+20
|/ / | | | | | | | | Add braces. Add final/private.
* | Merge pull request #975 from yahoo/hakon/use-ci-image-for-local-zoneHarald Musum2016-11-012-3/+3
|\ \ | | | | | | Use CI image for local zone
| * | Use CI image for local zoneHåkon Hallingstad2016-10-282-3/+3
| | |
* | | Merge pull request #981 from ↵Tor Brede Vekterli2016-10-313-4/+45
|\ \ \ | |_|/ |/| | | | | | | | yahoo/vegard/implement-update-serializing-of-create-if-non-existent-field Implement document update serializing of create if non existent field
| * | Initialize fieldVegard Sjonfjell2016-10-311-1/+1
| | |
| * | Implement document update serializing of create if non existent fieldVegard Sjonfjell2016-10-313-4/+45
| | |
* | | Merge pull request #979 from yahoo/hakon/log-suspend-and-resume-failureshakonhall2016-10-312-9/+9
|\ \ \ | | | | | | | | Log suspend and resume failures
| * | | Actually avoid logging stacktraceHåkon Hallingstad2016-10-311-2/+2
| | | |
| * | | Avoid logging stacktraceHåkon Hallingstad2016-10-311-1/+1
| | | |
| * | | Log suspend and resume failuresHåkon Hallingstad2016-10-311-8/+8
|/ / /
* | | Merge pull request #978 from ↵Henning Baldersheim2016-10-311-1/+6
|\ \ \ | | | | | | | | | | | | | | | | yahoo/balder/silence-ZKConnectionLossException-during-watcher-invocation Silence ZKConnectionLossException with a quick silen restart
| * | | Silence ZKConnectionLossException with a quick silen restartHenning Baldersheim2016-10-311-1/+6
| | | |
* | | | Merge pull request #977 from yahoo/hmusum/log-activation-lockJon Bratseth2016-10-313-0/+14
|\ \ \ \ | |/ / / |/| | | Add some logging to debug VESPA-5231
| * | | Add some logging to debug VESPA-5231Harald Musum2016-10-303-0/+14
| | |/ | |/|
* | | Merge pull request #976 from yahoo/frodelu/json-access-logJon Bratseth2016-10-3017-11/+665
|\ \ \ | |/ / |/| | JSON access log support [VESPA-5228]
| * | Test json log configuringJon Bratseth2016-10-301-10/+27
| | |
| * | Merge branch 'frodelu/json-access-log' of github.com:yahoo/vespa into ↵Jon Bratseth2016-10-3077-2134/+1881
| |\ \ | | | | | | | | | | | | frodelu/json-access-log
| | * | Changes after code review [VESPA-5228]:Frode Lundgren2016-10-303-182/+97
| | | | | | | | | | | | | | | | | | | | * Removed member variables; inlined assignments or create conversion methods * Pure numeric fields now written as JSON integers rather than strings
| | * | First stab at JSON access log [VESPA-5228]Frode Lundgren2016-10-296-1/+480
| |/ / |/| |
* | | Merge pull request #974 from yahoo/freva/docker-missing-handlingHarald Musum2016-10-2817-166/+206
|\ \ \ | | | | | | | | Missing container exception fix
| * | | Missing container exception fixfreva2016-10-2817-166/+206
| | | |
* | | | Merge pull request #973 from yahoo/balder/bucket-oriented-defaultKristian Aune2016-10-281-2/+2
|\ \ \ \ | |/ / / |/| | | Default bucketorder.
| * | | Default bucketorder.Henning Baldersheim2016-10-281-2/+2
|/ / /
* | | Merge pull request #961 from ↵Haakon Dybdahl2016-10-281-1/+6
|\ \ \ | | | | | | | | | | | | | | | | yahoo/vekterli/reduce-log-spam-on-state-transition-edge Reduce log level for "unexpected" wrong distribution reply to debug
| * | | Reduce log level for "unexpected" wrong distribution reply to debugTor Brede Vekterli2016-10-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client load can be rejected towards distributors even with a matching cluster state version. This usually happens during a node fail-over transition, where the target distributor will reject an operation bound to a particular bucket if it does not own the bucket in _both_ the current and the next (transition target) state. Since it can happen during normal operation and will happen per client operation, we keep this as debug level to prevent spamming the logs.
* | | | Merge pull request #972 from yahoo/balder/do-not-use-own-bufferpoolHenning Baldersheim2016-10-281-1/+1
|\ \ \ \ | | | | | | | | | | Revert to jetty default bufferpool.
| * | | | Revert to jetty default bufferpool.Henning Baldersheim2016-10-281-1/+1
|/ / / /
* | | | Merge pull request #969 from ↵Vegard Sjonfjell2016-10-283-12/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yahoo/geirst/validation-of-tensor-attribute-type-changes Add validation of tensor attribute tensor type changes.
| * | | | Add validation of tensor attribute tensor type changes.Geir Storli2016-10-273-12/+50
| | | | |
* | | | | Merge pull request #968 from yahoo/freva/removed-unused-filesHarald Musum2016-10-2816-1398/+14
|\ \ \ \ \ | | | | | | | | | | | | Removed unused files
| * | | | | Removed unused filesfreva2016-10-2716-1398/+14
| | | | | |
* | | | | | Merge pull request #971 from ↵Geir Storli2016-10-271-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | yahoo/balder/ignore-vespalib_dotproductbenchmark_app Ignore vespalib_dotproductbenchmark_app