summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Install net.jpountz.lz4:lz4 as a bundle.gjoranv2017-09-149-10/+57
* Merge pull request #3385 from vespa-engine/toregge/hold-gid-mapper-to-avoid-p...Geir Storli2017-09-129-37/+22
|\
| * remove unused mapGidToLid() method from gid to lid mapper. ReferenceTor Egge2017-09-115-35/+7
| * Keep a gid to lid mapper live during the lifetime of an imported attributeTor Egge2017-09-114-2/+15
* | Merge pull request #3393 from vespa-engine/bjorncs/athenzMorten Tokle2017-09-126-41/+4
|\ \
| * | Remove ZMS/Athens client without principalBjørn Christian Seime2017-09-126-41/+4
* | | Merge pull request #3383 from vespa-engine/aressem/delete-the-rpmbuild-branchJon Marius Venstad2017-09-121-1/+1
|\ \ \ | |/ / |/| |
| * | Actually delete the branch.Arnstein Ressem2017-09-111-1/+1
* | | Merge pull request #3389 from vespa-engine/hakon/add-component-managing-the-s...hakonhall2017-09-1215-98/+209
|\ \ \
| * | | Add component managing the SuperModelHåkon Hallingstad2017-09-1115-98/+209
| |/ /
* | | Merge pull request #3392 from vespa-engine/hmusum/avoid-log-noiseJon Bratseth2017-09-111-1/+1
|\ \ \
| * | | Make sure description is not empty to avois spamming logHarald Musum2017-09-111-1/+1
* | | | Merge pull request #3387 from vespa-engine/gjoranv/exclude-asmJon Bratseth2017-09-111-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Exclude org.ow2.asm:asm from provided classpath.gjoranv2017-09-111-0/+6
|/ / /
* | | Merge pull request #3386 from vespa-engine/revert-3384-gjoranv/exclude-findbugsgjoranv2017-09-111-22/+0
|\ \ \
| * | | Revert "Exclude findbugs artifacts from provided classpath."gjoranv2017-09-111-22/+0
|/ / /
* | | Merge pull request #3384 from vespa-engine/gjoranv/exclude-findbugsgjoranv2017-09-111-0/+22
|\ \ \ | |_|/ |/| |
| * | Exclude findbugs artifacts from provided classpath.gjoranv2017-09-111-0/+22
|/ /
* | Merge pull request #3380 from vespa-engine/arnej/cleanup-hostname-2Jon Bratseth2017-09-112-6/+5
|\ \
| * | use Defaults.vespaHostname()Arne Juul2017-09-112-6/+5
* | | Merge pull request #3379 from vespa-engine/mpolden/idempotent-deactivationHarald Musum2017-09-113-16/+35
|\ \ \
| * | | Make deactivate idempotentMartin Polden2017-09-113-16/+35
| | |/ | |/|
* | | Merge pull request #3381 from vespa-engine/gjoranv/exclude-HdrHistogramgjoranv2017-09-114-1/+15
|\ \ \
| * | | Expose HdrHistogram in test scope instead of provided for users.gjoranv2017-09-114-1/+15
|/ / /
* | | Merge pull request #3374 from vespa-engine/toregge/fedora-26-portArnstein Ressem2017-09-112-12/+65
|\ \ \
| * | | A C++ compiler and libatomic is needed to build on Fedora.Tor Egge2017-09-091-0/+4
| * | | Limited port to Fedora 25 and Fedora 26.Tor Egge2017-09-082-12/+61
* | | | Merge pull request #3375 from vespa-engine/freva/remove-hardware-failure-typeValerij Fredriksen2017-09-115-32/+1
|\ \ \ \
| * | | | Remove hardwareFailureTypeValerij Fredriksen2017-09-085-32/+1
* | | | | Merge pull request #3378 from vespa-engine/arnej/cleanup-hostnameJon Bratseth2017-09-113-12/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | simplify single node caseArne Juul2017-09-113-12/+5
|/ / / /
* | | | Merge pull request #3376 from vespa-engine/balder/bring-documenttype-alongJon Bratseth2017-09-113-5/+50
|\ \ \ \
| * | | | Add test that doctype is propagated correctly to where it is needed.Henning Baldersheim2017-09-081-3/+36
| * | | | This is a stringHenning Baldersheim2017-09-081-1/+1
| * | | | We need the document type too.Henning Baldersheim2017-09-081-2/+6
| * | | | Bring along the documenttype so that we know where to look for the documents.Henning Baldersheim2017-09-081-0/+8
| | |/ / | |/| |
* | | | Merge pull request #3377 from vespa-engine/hmusum/fail-on-not-getting-activat...Harald Musum2017-09-111-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Throw exception when not getting activate lock within timeoutHarald Musum2017-09-111-1/+1
|/ / /
* | | Merge pull request #3367 from vespa-engine/hakon/move-slobrokmonitor-to-javaBjørn Christian Seime2017-09-085-163/+100
|\ \ \
| * | | Review round 1 fixesHåkon Hallingstad2017-09-081-8/+8
| * | | Move SlobrokMonitor to JavaHåkon Hallingstad2017-09-075-163/+100
* | | | Merge pull request #3344 from vespa-engine/toregge/remove-unneeded-boundary-c...Geir Storli2017-09-087-14/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove boundary check for mapping from lid to referenced lid sinceTor Egge2017-09-067-14/+13
* | | | Merge pull request #3373 from vespa-engine/arnej/allow-env-overrideJon Bratseth2017-09-085-34/+13
|\ \ \ \
| * | | | use HostName.getLocalhostArne Juul2017-09-081-8/+2
| * | | | use HostName.getLocalhostArne Juul2017-09-081-11/+3
| * | | | use HostName.getLocalhostArne Juul2017-09-081-7/+2
| * | | | use HostName.getLocalhostArne Juul2017-09-081-7/+2
| * | | | allow override from env.varArne Juul2017-09-081-1/+4
* | | | | Merge pull request #3371 from vespa-engine/gjoranv/exclude-scala-xml3Bjørn Christian Seime2017-09-087-1/+35
|\ \ \ \ \ | |/ / / / |/| | | |