summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rename test parent artifact for clarity.gjoranv2018-05-033-3/+3
* Merge pull request #5768 from vespa-engine/bratseth/cleanup-hit-2Jon Bratseth2018-05-0321-455/+384
|\
| * Improve javadocJon Bratseth2018-05-031-6/+1
| * Optimize importsJon Bratseth2018-05-031-1/+0
| * Expect the right contextJon Bratseth2018-05-034-24/+25
| * Optimize importsJon Bratseth2018-05-032-4/+0
| * Reorganize code: No functional changeJon Bratseth2018-05-022-104/+84
| * Deprecate Hit.getTypeString()Jon Bratseth2018-05-026-20/+19
| * Stop using source number: Same uniqueness as source nameJon Bratseth2018-05-029-39/+23
| * Merge with masterJon Bratseth2018-05-0284-1005/+1225
| |\
| * | Reorganize code, no functional changeJon Bratseth2018-05-024-84/+90
| * | Deprecated more of the Hit APIJon Bratseth2018-04-303-22/+19
| * | Discontinue use of, and deprecate Hit.getFieldXMLJon Bratseth2018-04-306-19/+68
| * | Reorganize - no functional changesJon Bratseth2018-04-301-111/+77
| * | Remove RawField (not used)Jon Bratseth2018-04-302-45/+2
* | | Merge pull request #5766 from vespa-engine/vekterli/only-derive-default-space...Geir Storli2018-05-037-6/+84
|\ \ \
| * | | Only derive default bucket space node states when cluster has global docsTor Brede Vekterli2018-05-027-6/+84
| | |/ | |/|
* | | Merge pull request #5774 from vespa-engine/jvenstad/add-trigger-user-to-reasonBjørn Christian Seime2018-05-033-14/+10
|\ \ \
| * | | Add user which triggered job to its reasonJon Marius Venstad2018-05-033-14/+10
|/ / /
* | | Merge pull request #5773 from vespa-engine/kkraune/improve-messageJon Marius Venstad2018-05-031-1/+1
|\ \ \
| * | | make message usefulKristian Aune2018-05-031-1/+1
|/ / /
* | | Merge pull request #5771 from vespa-engine/toregge/increase-vespa-dispatch-ti...Tor Brede Vekterli2018-05-031-1/+1
|\ \ \
| * | | Increase timeout waiting for engines to be up when switching to newTor Egge2018-05-031-1/+1
* | | | Merge pull request #5772 from vespa-engine/mpolden/update-test-reasonJon Bratseth2018-05-036-77/+105
|\ \ \ \
| * | | | Add version combinations to test reasonMartin Polden2018-05-034-19/+33
| * | | | CleanupMartin Polden2018-05-033-44/+54
| * | | | Avoid passing around streamsMartin Polden2018-05-031-4/+8
| * | | | Avoid unnecessary Optional (un)wrappingMartin Polden2018-05-031-8/+9
| * | | | Use explicit type argumentsMartin Polden2018-05-031-5/+4
* | | | | Merge pull request #5770 from vespa-engine/mpolden/shorten-log-messageMartin Polden2018-05-033-10/+17
|\ \ \ \ \
| * | | | | Shorten log messages in zone API handlersMartin Polden2018-05-032-2/+4
| * | | | | Shorten log messageMartin Polden2018-05-031-8/+13
| |/ / / /
* | | | | Merge pull request #5767 from vespa-engine/gjoranv/java9-prep-06gjoranv2018-05-039-47/+70
|\ \ \ \ \
| * | | | | Catch ReflectiveOperationException instead of subclasses.gjoranv2018-05-031-2/+1
| * | | | | Java 9: Class.newInstance() is deprecated.gjoranv2018-05-021-1/+1
| * | | | | Java 9: Add jaxb-api dependency and remove some package referencesgjoranv2018-05-025-43/+64
| * | | | | Replace usage of apis deprecated in Java 9.gjoranv2018-05-022-3/+5
| * | | | | Java 9: Suppress deprecation warning for finalize()gjoranv2018-05-021-0/+1
* | | | | | Merge pull request #5769 from vespa-engine/gjoranv/deprecate-xml-providersJon Bratseth2018-05-0315-44/+43
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Deprecate all builtin XML providers in jdisc.gjoranv2018-05-0215-44/+43
| |/ / / /
* | | | | Merge pull request #5735 from vespa-engine/mpolden/upgrade-system-applicationsMartin Polden2018-05-0323-145/+536
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Define and upgrade system applicationsMartin Polden2018-05-0223-145/+536
| |/ / /
* | | | Merge pull request #5764 from vespa-engine/revert-5762-revert-5758-gjoranv/ja...gjoranv2018-05-0254-173/+199
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Revert "Gjoranv/java9 prep 05""gjoranv2018-05-0254-173/+199
| |/ /
* | | Merge pull request #5765 from vespa-engine/bratseth/skip-old-config-models-re...Jon Bratseth2018-05-024-61/+43
|\ \ \
| * | | Don't require an existing model when preparingJon Bratseth2018-05-024-61/+43
* | | | Merge pull request #5763 from vespa-engine/gjoranv/felix-5.0.1gjoranv2018-05-021-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Upgrade felix to 5.0.1.gjoranv2018-05-021-1/+1
* | | | Merge pull request #5756 from vespa-engine/bjorncs/use-sia-with-node-adminBjørn Christian Seime2018-05-026-158/+103
|\ \ \ \
| * | | | Rewrite SslConnectionSocketFactoryUpdater to use credentials from SIABjørn Christian Seime2018-04-305-158/+84