Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add compulsory description for metrics | Arne Juul | 2017-12-07 | 7 | -15/+21 |
* | use vespalib metrics library | Arne Juul | 2017-12-07 | 4 | -67/+39 |
* | Merge pull request #4372 from vespa-engine/arnej/vespalib-metrics-update-9 | Håvard Pettersen | 2017-12-07 | 24 | -128/+234 |
|\ | |||||
| * | integrate new MockTick from havardpe | Arne Juul | 2017-12-05 | 6 | -112/+91 |
| * | update metrics library after review | Arne Juul | 2017-12-05 | 24 | -55/+182 |
* | | Merge pull request #4377 from vespa-engine/toregge/use-alternate-maxflushed-p... | Henning Baldersheim | 2017-12-07 | 28 | -21/+228 |
|\ \ | |||||
| * | | Use alternate maxflushed parameter (max number of flushed memory indexes | Tor Egge | 2017-12-07 | 28 | -21/+228 |
* | | | Merge pull request #4126 from vespa-engine/vekterli/move-to-flex-bison-parsin... | Tor Brede Vekterli | 2017-12-07 | 33 | -1809/+1249 |
|\ \ \ | |||||
| * | | | Use new C++ document selection parser | Tor Brede Vekterli | 2017-11-14 | 33 | -1809/+1249 |
* | | | | Merge pull request #4375 from vespa-engine/aressem/disable-filedistribution-b... | Henning Baldersheim | 2017-12-07 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Disable filedistribution by default. | Arnstein Ressem | 2017-12-07 | 1 | -0/+1 |
* | | | | | Merge pull request #4363 from vespa-engine/hmusum/remove-unused-method | Morten Tokle | 2017-12-07 | 1 | -9/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unused method from API | Harald Musum | 2017-12-06 | 1 | -9/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4369 from vespa-engine/bjorncs/more-robust-ssl-init | Bjørn Christian Seime | 2017-12-06 | 1 | -21/+41 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unnecessary use of AtomicReference | Bjørn Christian Seime | 2017-12-06 | 1 | -4/+4 |
| * | | | | | Retrieve initial certificate in constructor for fail-fast semantics | Bjørn Christian Seime | 2017-12-06 | 1 | -19/+41 |
| * | | | | | Don't warn when actual expiry is longer than expected | Bjørn Christian Seime | 2017-12-06 | 1 | -7/+5 |
* | | | | | | Merge pull request #4371 from vespa-engine/gjoranv/parent-pom-fix | Morten Tokle | 2017-12-06 | 2 | -35/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add missing elements to container-dependency-versions pom. | gjoranv | 2017-12-06 | 2 | -35/+51 |
* | | | | | | | Merge pull request #4368 from vespa-engine/bjorncs/fix | Valerij Fredriksen | 2017-12-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix silly bug | Bjørn Christian Seime | 2017-12-06 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4367 from vespa-engine/balder/fix-logic-flaw-causing-miss... | Henning Baldersheim | 2017-12-06 | 18 | -521/+76 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add some more logging and only update config if md5 has changed. | Henning Baldersheim | 2017-12-06 | 1 | -2/+6 |
| * | | | | | Set _configState before calling out to holder. | Henning Baldersheim | 2017-12-06 | 1 | -1/+1 |
| * | | | | | Revert "Revert "Balder/fix logic flaw causing missing config changes"" | Henning Baldersheim | 2017-12-06 | 18 | -522/+73 |
|/ / / / / | |||||
* | | | | | Merge pull request #4365 from vespa-engine/bjorncs/move-athenz-api-to-control... | Morten Tokle | 2017-12-06 | 43 | -330/+281 |
|\ \ \ \ \ | |||||
| * | | | | | Add class for Athenz role token | Bjørn Christian Seime | 2017-12-06 | 1 | -0/+36 |
| * | | | | | Move all Athenz API classes to controller-api | Bjørn Christian Seime | 2017-12-06 | 40 | -113/+121 |
| * | | | | | Add NToken to AthenzPrincipal | Bjørn Christian Seime | 2017-12-06 | 5 | -6/+20 |
| * | | | | | remove reference ZMSClientException/ZTSClientException | Bjørn Christian Seime | 2017-12-06 | 5 | -16/+14 |
| * | | | | | Remove reference to PrincipalToken from NToken | Bjørn Christian Seime | 2017-12-06 | 7 | -156/+51 |
* | | | | | | Merge pull request #4359 from vespa-engine/freva/remove-context-from-proxy | Bjørn Christian Seime | 2017-12-06 | 1 | -10/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove Context from proxy methods | Valerij Fredriksen | 2017-12-05 | 1 | -10/+4 |
* | | | | | | | Merge pull request #4366 from vespa-engine/vekterli/disallow-empty-user-group... | Henning Baldersheim | 2017-12-06 | 2 | -6/+45 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Disallow ID strings with empty user/group values | Tor Brede Vekterli | 2017-12-06 | 2 | -6/+45 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4364 from vespa-engine/bjorncs/use-same-issuer-name | Morten Tokle | 2017-12-06 | 1 | -5/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Match issuer name defined in self-signed cert in trust store | Bjørn Christian Seime | 2017-12-06 | 1 | -5/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #4333 from vespa-engine/hakonhall/support-making-standalon... | Håkon Hallingstad | 2017-12-06 | 6 | -0/+682 |
|\ \ \ \ \ | |||||
| * | | | | | Fix review comments | Håkon Hallingstad | 2017-12-05 | 4 | -17/+110 |
| * | | | | | Move build-rpm to dist | Håkon Hallingstad | 2017-12-04 | 1 | -0/+0 |
| * | | | | | Highlight commonality among dependency jar files | Håkon Hallingstad | 2017-12-04 | 1 | -22/+23 |
| * | | | | | Move services.xml to application directory and remove stray dependency | Håkon Hallingstad | 2017-12-04 | 2 | -2/+1 |
| * | | | | | Support making standalone container and node admin RPMs | Håkon Hallingstad | 2017-12-04 | 7 | -0/+589 |
* | | | | | | Merge pull request #4360 from vespa-engine/mpolden/curator-lock-for-rotation-... | Jon Bratseth | 2017-12-05 | 10 | -66/+108 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use curator lock when assigning rotation | Martin Polden | 2017-12-05 | 5 | -35/+75 |
| * | | | | | | Clean up test code | Martin Polden | 2017-12-05 | 5 | -31/+33 |
* | | | | | | | Merge pull request #4361 from vespa-engine/revert-4349-mortent/remove-keyservice | Arnstein Ressem | 2017-12-05 | 6 | -16/+52 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Revert "Replace usage of KeyService with SecretStore" | Arnstein Ressem | 2017-12-05 | 6 | -16/+52 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4357 from vespa-engine/toregge/delay-check-of-totals-unti... | Henning Baldersheim | 2017-12-05 | 1 | -9/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Delay check of total memory and disk gains until we have calculated the | Tor Egge | 2017-12-05 | 1 | -9/+10 |