aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| | * | | Expose sia config from config-server.def in ConfigServerInfoBjørn Christian Seime2018-04-301-0/+19
| * | | | Merge pull request #5755 from vespa-engine/bjorncs/athenz-identity-providerMorten Tokle2018-05-026-64/+135
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use new identity document api pathBjørn Christian Seime2018-04-301-2/+1
| | * | | Add initial implementation for retrieving role token/certBjørn Christian Seime2018-04-303-1/+101
| | * | | Rename AthenzService -> ZtsClientBjørn Christian Seime2018-04-274-30/+31
| | * | | Reuse SSLContext when communicating with ZTSBjørn Christian Seime2018-04-274-36/+7
| * | | | Merge pull request #5762 from vespa-engine/revert-5758-gjoranv/java9-prep-05Arnstein Ressem2018-05-0254-199/+173
| |\ \ \ \
| | * | | | Revert "Gjoranv/java9 prep 05"gjoranv2018-05-0254-199/+173
| |/ / / /
| * | | | Merge pull request #5761 from vespa-engine/hmusum/cleanup-3Valerij Fredriksen2018-05-027-67/+27
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | SimplifyHarald Musum2018-05-027-67/+27
| * | | | Merge pull request #5758 from vespa-engine/gjoranv/java9-prep-05gjoranv2018-05-0154-173/+199
| |\ \ \ \
| | * | | | Java 9: Replace 'new Double' with 'Double.valueOf'gjoranv2018-05-0113-17/+17
| | * | | | Java 9: Replace 'new Long' with 'Long.valueOf'gjoranv2018-05-018-8/+8
| | * | | | Java 9: Replace 'new Integer' with 'Integer.valueOf'gjoranv2018-04-3032-105/+105
| | * | | | Replace usage of apis deprecated in Java 9.gjoranv2018-04-301-2/+2
| | * | | | Allow building with Java 9.gjoranv2018-04-303-8/+12
| | * | | | Replace usage of apis deprecated in Java 9.gjoranv2018-04-301-2/+4
| | * | | | Fix usage of apis deprecated from Java 9.gjoranv2018-04-302-16/+26
| | * | | | Declare methods private and remove redundant comment.gjoranv2018-04-301-5/+2
| | * | | | Don't use wildcard imports.gjoranv2018-04-301-2/+15
| | * | | | Remove unnecessary boxing.gjoranv2018-04-301-8/+8
| * | | | | Merge pull request #5759 from vespa-engine/freva/stable-acl-orderValerij Fredriksen2018-05-016-31/+51
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Run aclMaintainer once only when starting containerValerij Fredriksen2018-05-011-1/+1
| | * | | | Trim lines from list tableValerij Fredriksen2018-05-011-0/+1
| | * | | | Fix NoSuchElementExceptionValerij Fredriksen2018-05-011-0/+3
| | * | | | Sort ports and ipaddresses before applyingValerij Fredriksen2018-04-303-4/+15
| | * | | | Use LinkedList to create rulesValerij Fredriksen2018-04-303-26/+31
| |/ / / /
| * | | | Merge pull request #5752 from vespa-engine/jvenstad/deplorch-cleanupJon Marius Venstad2018-04-302-130/+140
| |\ \ \ \
| | * | | | Purely nonfunctional (reordering and comments)Jon Marius Venstad2018-04-301-129/+139
| | * | | | Shorter period for version status maintainerJon Marius Venstad2018-04-301-1/+1
| * | | | | Merge pull request #5757 from vespa-engine/hakonhall/randomize-configserver-urisHåkon Hallingstad2018-04-301-4/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Randomize configserver URIsHåkon Hallingstad2018-04-301-4/+3
| * | | | | Merge pull request #5754 from vespa-engine/bratseth/remove-old-junit-usagegjoranv2018-04-3040-401/+660
| |\ \ \ \ \
| | * | | | | Remove usage of junit.frameworkJon Bratseth2018-04-3040-401/+660
| * | | | | | Merge pull request #5700 from vespa-engine/hmusum/move-rpc-http-messagebus-en...gjoranv2018-04-305-45/+49
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Remove duplicated method and move setting of enabled flags for rpc and httpHarald Musum2018-04-302-9/+5
| | * | | | | Move flags for rpc, messagebus and http enabled to container clusterHarald Musum2018-04-255-40/+48
| * | | | | | Merge pull request #5753 from vespa-engine/toregge/remove-for-unknown-documen...Tor Brede Vekterli2018-04-306-43/+13
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |