summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge with masterJon Bratseth2018-06-01192-4255/+7280
|\
| * Merge pull request #6037 from vespa-engine/bjorncs/new-unique-instance-idMorten Tokle2018-06-0121-73/+250
| |\
| | * Use identity type to generate identity documentBjørn Christian Seime2018-05-315-26/+18
| | * Add identity type to unique instance id and signed identity documentBjørn Christian Seime2018-05-3112-28/+135
| | * Prepare for inlining of 'IdentityDocument' into 'SignedIdentityDocument'Bjørn Christian Seime2018-05-3111-22/+108
| | * Remove parent hostname from identity documentBjørn Christian Seime2018-05-312-10/+2
| * | Merge pull request #6043 from vespa-engine/hmusum/only-delete-filereferences-...Martin Polden2018-06-012-5/+30
| |\ \
| | * | Only delete unused file references that was created more than 14 days agoHarald Musum2018-05-312-5/+30
| * | | Merge pull request #6045 from vespa-engine/revert-6035-vekterli/ensure-visito...Henning Baldersheim2018-05-311-113/+148
| |\ \ \
| | * | | Revert "Ensure visitormanager tests clean up after themselves"Henning Baldersheim2018-05-311-113/+148
| |/ / /
| * | | Merge pull request #6031 from vespa-engine/balder/ensure-we-only-create-one-n...Henning Baldersheim2018-05-311-6/+36
| |\ \ \
| | * | | Throw IllegalStateException instead of returning null.Henning Baldersheim2018-05-311-1/+6
| | * | | Ensure we do not race on cache creation and create many caches that we just t...Henning Baldersheim2018-05-311-6/+31
| * | | | Merge pull request #6025 from vespa-engine/balder/lazy-documentupdate-precleanupHenning Baldersheim2018-05-3113-539/+259
| |\ \ \ \
| | * | | | Add missing spaceHenning Baldersheim2018-05-311-1/+1
| | * | | | Make it privateHenning Baldersheim2018-05-311-3/+2
| | * | | | c++11ificationHenning Baldersheim2018-05-312-256/+170
| | * | | | GC some more unused code and properly test old formats without exposing produ...Henning Baldersheim2018-05-317-190/+77
| | * | | | Hide implementation details.Henning Baldersheim2018-05-314-30/+22
| | * | | | GC unused codeHenning Baldersheim2018-05-312-18/+0
| | * | | | Though shall never produce old format again, except from tests.Henning Baldersheim2018-05-316-65/+11
| * | | | | Merge pull request #6041 from vespa-engine/geirst/derive-map-of-struct-field-...Henning Baldersheim2018-05-318-27/+181
| |\ \ \ \ \
| | * | | | | Support that map of simple struct field is derived into array attributes.Geir Storli2018-05-318-27/+181
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #6035 from vespa-engine/vekterli/ensure-visitormanager-tes...Henning Baldersheim2018-05-311-148/+113
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Clean up some old codeTor Brede Vekterli2018-05-311-79/+44
| | * | | | Clean up visitors that we've already initiatedTor Brede Vekterli2018-05-311-10/+37
| | * | | | Simplify testsTor Brede Vekterli2018-05-311-45/+2
| | * | | | Wait for all started visitors to finishTor Brede Vekterli2018-05-311-14/+30
| | |/ / /
| * | | | Merge pull request #6042 from vespa-engine/revert-6029-hakonhall/make-health-...Valerij Fredriksen2018-05-3134-1295/+399
| |\ \ \ \
| | * | | | Revert "Make health client wo using it"Harald Musum2018-05-3134-1295/+399
| |/ / / /
| * | | | Merge pull request #6038 from vespa-engine/havardpe/same-element-builderArne H Juul2018-05-316-12/+196
| |\ \ \ \
| | * | | | build same element blueprintHåvard Pettersen2018-05-316-12/+196
| * | | | | Merge pull request #6036 from vespa-engine/hakonhall/move-athenz-provider-ser...Bjørn Christian Seime2018-05-312-0/+5
| |\ \ \ \ \
| | * | | | | Remove from public apiHåkon Hallingstad2018-05-311-1/+0
| | * | | | | Add package-infoHåkon Hallingstad2018-05-311-0/+6
| | * | | | | Move athenz-provider-service.def to configdefinitionsHåkon Hallingstad2018-05-311-0/+0
| * | | | | | Merge pull request #6039 from vespa-engine/revert-6019-gjoranv/felix-5.2.0Håkon Hallingstad2018-05-311-1/+1
| |\ \ \ \ \ \
| | * | | | | | Revert "Upgrade felix to 5.2.0"gjoranv2018-05-311-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #6029 from vespa-engine/hakonhall/make-health-client-wo-us...Håkon Hallingstad2018-05-3134-399/+1295
| |\ \ \ \ \ \
| | * | | | | | Use ConfigServerUtil and fix copyrightHåkon Hallingstad2018-05-313-19/+4
| | * | | | | | Make health client wo using itHåkon Hallingstad2018-05-3134-398/+1309
| * | | | | | | Merge pull request #6030 from vespa-engine/toregge/handle-struct-map-in-attri...Geir Storli2018-05-313-10/+74
| |\ \ \ \ \ \ \
| | * | | | | | | Adjust name of compound attribute in map of struct to match field path.Tor Egge2018-05-312-40/+8
| | * | | | | | | Handle struct map in attribute writer.Tor Egge2018-05-313-10/+106
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #6033 from vespa-engine/mortent/memoize-node-repoMartin Polden2018-05-311-19/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Use guava supplier for node listMorten Tokle2018-05-311-19/+6
| * | | | | | | | Merge pull request #6018 from vespa-engine/ovirtanen/convert-scala-to-java-in...Olli Virtanen2018-05-3123-961/+1390
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Scala code in standalone-container converted to JavaOlli Virtanen2018-05-3123-961/+1390
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #6028 from vespa-engine/mortent/cache-node-repo-access-con...Harald Musum2018-05-311-1/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Keep a copy of node repository to prevent frequent zk accessMorten Tokle2018-05-311-1/+21