Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Install net.jpountz.lz4:lz4 as a bundle. | gjoranv | 2017-09-14 | 9 | -10/+57 |
| | | | | | | | | | - From vespajlib. - It must still be a compile scope dep in order to make it a transitive dep for dependents of vespajlib. (Important to allow using vespajlib as a library outside the jdisc container.) - Hence, lz4 is still on the bundle classpath, but the explicitly added Import-Package overrides the bundle classpath. | ||||
* | Merge pull request #3385 from ↵ | Geir Storli | 2017-09-12 | 9 | -37/+22 |
|\ | | | | | | | | | vespa-engine/toregge/hold-gid-mapper-to-avoid-premature-referenced-lid-reuse Keep a gid to lid mapper live during the lifetime of an imported attr… | ||||
| * | remove unused mapGidToLid() method from gid to lid mapper. Reference | Tor Egge | 2017-09-11 | 5 | -35/+7 |
| | | | | | | | | | | attribute uses foreach() method on gid to lid mapper to bootstrap internal mapping and receives notifyReferenced*() method calls to keep it updated. | ||||
| * | Keep a gid to lid mapper live during the lifetime of an imported attribute | Tor Egge | 2017-09-11 | 4 | -2/+15 |
| | | | | | | | | read guard, to avoid premature reuse of referenced lid. | ||||
* | | Merge pull request #3393 from vespa-engine/bjorncs/athenz | Morten Tokle | 2017-09-12 | 6 | -41/+4 |
|\ \ | | | | | | | Remove ZMS/Athens client without principal | ||||
| * | | Remove ZMS/Athens client without principal | Bjørn Christian Seime | 2017-09-12 | 6 | -41/+4 |
| | | | |||||
* | | | Merge pull request #3383 from vespa-engine/aressem/delete-the-rpmbuild-branch | Jon Marius Venstad | 2017-09-12 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Actually delete the branch. | ||||
| * | | Actually delete the branch. | Arnstein Ressem | 2017-09-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3389 from ↵ | hakonhall | 2017-09-12 | 15 | -98/+209 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/hakon/add-component-managing-the-supermodel Add component managing the SuperModel | ||||
| * | | | Add component managing the SuperModel | Håkon Hallingstad | 2017-09-11 | 15 | -98/+209 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This is the prerequisite step for having the Orchestrator depend on the SuperModel component, getting notified via SuperModelListener about newly activated or removed applications. The Orchestrator will then register for Slobrok as necessary, and also update its data structures of the model. | ||||
* | | | Merge pull request #3392 from vespa-engine/hmusum/avoid-log-noise | Jon Bratseth | 2017-09-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Make sure description is not empty to avois spamming log | ||||
| * | | | Make sure description is not empty to avois spamming log | Harald Musum | 2017-09-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3387 from vespa-engine/gjoranv/exclude-asm | Jon Bratseth | 2017-09-11 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | Exclude org.ow2.asm:asm from provided classpath. | ||||
| * | | | Exclude org.ow2.asm:asm from provided classpath. | gjoranv | 2017-09-11 | 1 | -0/+6 |
|/ / / | | | | | | | | | | - Test classpath already contains org.ow2.asm:asm-debug-all. | ||||
* | | | Merge pull request #3386 from vespa-engine/revert-3384-gjoranv/exclude-findbugs | gjoranv | 2017-09-11 | 1 | -22/+0 |
|\ \ \ | | | | | | | | | Revert "Exclude findbugs artifacts from provided classpath." | ||||
| * | | | Revert "Exclude findbugs artifacts from provided classpath." | gjoranv | 2017-09-11 | 1 | -22/+0 |
|/ / / | |||||
* | | | Merge pull request #3384 from vespa-engine/gjoranv/exclude-findbugs | gjoranv | 2017-09-11 | 1 | -0/+22 |
|\ \ \ | |_|/ |/| | | Exclude findbugs artifacts from provided classpath. | ||||
| * | | Exclude findbugs artifacts from provided classpath. | gjoranv | 2017-09-11 | 1 | -0/+22 |
|/ / | | | | | | | | | | | | | - com.google.code.findbugs:annotations:jar:1.3.9 - com.google.code.findbugs:jsr305:jar:1.3.9 * There should be no reason to expose these in test scope, they only contain annotations. | ||||
* | | Merge pull request #3380 from vespa-engine/arnej/cleanup-hostname-2 | Jon Bratseth | 2017-09-11 | 2 | -6/+5 |
|\ \ | | | | | | | use Defaults.vespaHostname() | ||||
| * | | use Defaults.vespaHostname() | Arne Juul | 2017-09-11 | 2 | -6/+5 |
| | | | | | | | | | | | | * also fix test to be consistent, it would fail on laptop with Wi-Fi | ||||
* | | | Merge pull request #3379 from vespa-engine/mpolden/idempotent-deactivation | Harald Musum | 2017-09-11 | 3 | -16/+35 |
|\ \ \ | | | | | | | | | Make deactivate idempotent | ||||
| * | | | Make deactivate idempotent | Martin Polden | 2017-09-11 | 3 | -16/+35 |
| | |/ | |/| | |||||
* | | | Merge pull request #3381 from vespa-engine/gjoranv/exclude-HdrHistogram | gjoranv | 2017-09-11 | 4 | -1/+15 |
|\ \ \ | | | | | | | | | Expose HdrHistogram in test scope instead of provided for users. | ||||
| * | | | Expose HdrHistogram in test scope instead of provided for users. | gjoranv | 2017-09-11 | 4 | -1/+15 |
|/ / / | | | | | | | | | | | | | | | | - It's not provided runtime, but we should consider doing so, as simplemetric:UntypedMetric exposes a public method that returns an org.HdrHistogram.DoubleHistogram. | ||||
* | | | Merge pull request #3374 from vespa-engine/toregge/fedora-26-port | Arnstein Ressem | 2017-09-11 | 2 | -12/+65 |
|\ \ \ | | | | | | | | | Limited port to Fedora 25 and Fedora 26. | ||||
| * | | | A C++ compiler and libatomic is needed to build on Fedora. | Tor Egge | 2017-09-09 | 1 | -0/+4 |
| | | | | |||||
| * | | | Limited port to Fedora 25 and Fedora 26. | Tor Egge | 2017-09-08 | 2 | -12/+61 |
| | | | | |||||
* | | | | Merge pull request #3375 from vespa-engine/freva/remove-hardware-failure-type | Valerij Fredriksen | 2017-09-11 | 5 | -32/+1 |
|\ \ \ \ | | | | | | | | | | | Remove hardwareFailureType | ||||
| * | | | | Remove hardwareFailureType | Valerij Fredriksen | 2017-09-08 | 5 | -32/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3378 from vespa-engine/arnej/cleanup-hostname | Jon Bratseth | 2017-09-11 | 3 | -12/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | simplify single node case | ||||
| * | | | | simplify single node case | Arne Juul | 2017-09-11 | 3 | -12/+5 |
|/ / / / | |||||
* | | | | Merge pull request #3376 from vespa-engine/balder/bring-documenttype-along | Jon Bratseth | 2017-09-11 | 3 | -5/+50 |
|\ \ \ \ | | | | | | | | | | | Balder/bring documenttype along | ||||
| * | | | | Add test that doctype is propagated correctly to where it is needed. | Henning Baldersheim | 2017-09-08 | 1 | -3/+36 |
| | | | | | |||||
| * | | | | This is a string | Henning Baldersheim | 2017-09-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | We need the document type too. | Henning Baldersheim | 2017-09-08 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | Bring along the documenttype so that we know where to look for the documents. | Henning Baldersheim | 2017-09-08 | 1 | -0/+8 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3377 from ↵ | Harald Musum | 2017-09-11 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | vespa-engine/hmusum/fail-on-not-getting-activate-lock Throw exception when not getting activate lock within timeout | ||||
| * | | | Throw exception when not getting activate lock within timeout | Harald Musum | 2017-09-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3367 from vespa-engine/hakon/move-slobrokmonitor-to-java | Bjørn Christian Seime | 2017-09-08 | 5 | -163/+100 |
|\ \ \ | | | | | | | | | Move SlobrokMonitor to Java | ||||
| * | | | Review round 1 fixes | Håkon Hallingstad | 2017-09-08 | 1 | -8/+8 |
| | | | | |||||
| * | | | Move SlobrokMonitor to Java | Håkon Hallingstad | 2017-09-07 | 5 | -163/+100 |
| | | | | |||||
* | | | | Merge pull request #3344 from ↵ | Geir Storli | 2017-09-08 | 7 | -14/+13 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | vespa-engine/toregge/remove-unneeded-boundary-check Remove boundary check for mapping from lid to referenced lid since | ||||
| * | | | Remove boundary check for mapping from lid to referenced lid since | Tor Egge | 2017-09-06 | 7 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | target attribute is populated before referenced lid is added to mapping. Adjust getReferencedLids() method to return const array ref with safe size. | ||||
* | | | | Merge pull request #3373 from vespa-engine/arnej/allow-env-override | Jon Bratseth | 2017-09-08 | 5 | -34/+13 |
|\ \ \ \ | | | | | | | | | | | Arnej/allow env override | ||||
| * | | | | use HostName.getLocalhost | Arne Juul | 2017-09-08 | 1 | -8/+2 |
| | | | | | |||||
| * | | | | use HostName.getLocalhost | Arne Juul | 2017-09-08 | 1 | -11/+3 |
| | | | | | |||||
| * | | | | use HostName.getLocalhost | Arne Juul | 2017-09-08 | 1 | -7/+2 |
| | | | | | |||||
| * | | | | use HostName.getLocalhost | Arne Juul | 2017-09-08 | 1 | -7/+2 |
| | | | | | |||||
| * | | | | allow override from env.var | Arne Juul | 2017-09-08 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #3371 from vespa-engine/gjoranv/exclude-scala-xml3 | Bjørn Christian Seime | 2017-09-08 | 7 | -1/+35 |
|\ \ \ \ \ | |/ / / / |/| | | | | Exclude scala-xml from provided classpath |