Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3990 from vespa-engine/bjorncs/fix | Bjørn Christian Seime | 2017-11-02 | 2 | -7/+5 |
|\ | |||||
| * | Work around akward semantics with TemporalAmount/Duration | Bjørn Christian Seime | 2017-11-02 | 2 | -7/+5 |
|/ | |||||
* | Merge pull request #3919 from vespa-engine/bratseth/OWNERS-cleanup | Kim Omar Johansen | 2017-11-02 | 5 | -5/+0 |
|\ | |||||
| * | Remove tmartins and empty lines | Jon Bratseth | 2017-10-27 | 5 | -5/+0 |
* | | Merge pull request #3978 from vespa-engine/bjorncs/reduce-log-spam | gjoranv | 2017-11-02 | 2 | -68/+105 |
|\ \ | |||||
| * | | Cleanup MetricUpdater | Bjørn Christian Seime | 2017-11-02 | 2 | -70/+105 |
| * | | Don't log exception if Linux specific file does not exist | Bjørn Christian Seime | 2017-11-02 | 1 | -0/+2 |
* | | | Merge pull request #3984 from vespa-engine/vekterli/add-reserved-document-typ... | Jon Bratseth | 2017-11-02 | 4 | -0/+123 |
|\ \ \ | |||||
| * | | | Add reserved name validation for document type names | Tor Brede Vekterli | 2017-11-02 | 4 | -0/+123 |
* | | | | Merge pull request #3977 from vespa-engine/mortent/identity-provider-read-secret | Bjørn Christian Seime | 2017-11-02 | 6 | -39/+126 |
|\ \ \ \ | |||||
| * | | | | Read key from secretstore, refactor config | Morten Tokle | 2017-11-02 | 6 | -39/+126 |
* | | | | | Merge pull request #3982 from vespa-engine/toregge/rename-managed-bucket-spac... | Geir Storli | 2017-11-02 | 16 | -78/+78 |
|\ \ \ \ \ | |||||
| * | | | | | Rename ManagedBucketSpace to DistributorBucketSpace. | Tor Egge | 2017-11-02 | 16 | -78/+78 |
* | | | | | | Merge pull request #3980 from vespa-engine/geirst/add-content-bucket-space-repo | Tor Brede Vekterli | 2017-11-02 | 10 | -13/+100 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Change to return a reference to a bucket space to indicate that it should alw... | Geir Storli | 2017-11-02 | 4 | -5/+5 |
| * | | | | | Use nullptr instead of literal 0. | Geir Storli | 2017-11-02 | 2 | -3/+3 |
| * | | | | | Add repo for all bucket spaces (with associated bucket databases) on a conten... | Geir Storli | 2017-11-02 | 10 | -12/+99 |
* | | | | | | Merge pull request #3981 from vespa-engine/bratseth/add-import | Jon Bratseth | 2017-11-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add import | Jon Bratseth | 2017-11-02 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3972 from vespa-engine/hmusum/remove-deprecated-method | Jon Bratseth | 2017-11-02 | 1 | -13/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Remove deprecated, unused method and default implementation from interface | Harald Musum | 2017-11-02 | 1 | -13/+2 |
* | | | | | | Merge pull request #3968 from vespa-engine/bratseth/upgrade-to-latest-good | Jon Bratseth | 2017-11-02 | 14 | -149/+286 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename method | Jon Bratseth | 2017-11-02 | 1 | -3/+3 |
| * | | | | | | Newer downgrade a production deployment | Jon Bratseth | 2017-11-02 | 4 | -19/+72 |
| * | | | | | | Always try to upgrade to the latest good version | Jon Bratseth | 2017-11-01 | 9 | -130/+214 |
| * | | | | | | Nonfunctional changes only | Jon Bratseth | 2017-10-31 | 2 | -2/+2 |
* | | | | | | | Merge pull request #3973 from vespa-engine/toregge/use-document-bucket-in-pri... | Geir Storli | 2017-11-02 | 19 | -106/+115 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Fix BucketAndNodes constructor declarations. | Tor Egge | 2017-11-02 | 1 | -4/+4 |
| * | | | | | | Adjust MaintenancePriorityGenerator and MaintenanceOperationGenerator to | Tor Egge | 2017-11-02 | 11 | -48/+55 |
| * | | | | | | Use document::Bucket in PrioritizedBucket. | Tor Egge | 2017-11-02 | 10 | -56/+58 |
* | | | | | | | Merge pull request #3976 from vespa-engine/geirst/order-sources-in-storage-cm... | Geir Storli | 2017-11-02 | 25 | -146/+146 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Order sources in CMakeLists.txt files. | Geir Storli | 2017-11-02 | 25 | -146/+146 |
* | | | | | | | Merge pull request #3975 from vespa-engine/mpolden/include-controller-config | Martin Polden | 2017-11-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include controller config in configserver-app | Martin Polden | 2017-11-02 | 1 | -0/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3940 from vespa-engine/hakonhall/use-host-tag-instead-of-... | Bjørn Christian Seime | 2017-11-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use host tag instead of hostname | Håkon Hallingstad | 2017-10-30 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #3967 from vespa-engine/bjorncs/travis | Henning Baldersheim | 2017-11-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Tune malloc to reduce chance of OoM | Bjørn Christian Seime | 2017-11-01 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3964 from vespa-engine/bjorncs/athenz-user-domain | gjoranv | 2017-11-02 | 4 | -8/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Athenz now uses "user" as principal domain and "home" as personal domain | Bjørn Christian Seime | 2017-11-01 | 4 | -8/+9 |
* | | | | | | | | Merge pull request #3971 from vespa-engine/revert-3957-revert-3943-toregge/us... | Håkon Hallingstad | 2017-11-02 | 28 | -691/+276 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Revert "Revert "Toregge/use standard locks in fastos"" | Arnstein Ressem | 2017-11-02 | 28 | -691/+276 |
* | | | | | | | | Merge pull request #3965 from vespa-engine/havardpe/unify-conformance-test-fo... | Lester Solbakken | 2017-11-02 | 7 | -468/+264 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | unify conformance test format, refactor code and update spec | Håvard Pettersen | 2017-11-01 | 7 | -468/+264 |
* | | | | | | | | Merge pull request #3966 from vespa-engine/hakonhall/avoid-changing-api-befor... | Håkon Hallingstad | 2017-11-02 | 2 | -8/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Avoid changing API before all clients handle it | Håkon Hallingstad | 2017-11-01 | 2 | -8/+15 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #3962 from vespa-engine/toregge/use-document-bucket-as-pen... | Geir Storli | 2017-11-02 | 10 | -42/+40 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Pass document::Bucket to Distributor::recheckBucketInfo. | Tor Egge | 2017-11-01 | 9 | -18/+16 |
| * | | | | | | | Use document::Bucket as pending message tracker key. | Tor Egge | 2017-11-01 | 3 | -25/+25 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3963 from vespa-engine/jvenstad/correct-platform-issue-fi... | Jon Marius Venstad | 2017-11-02 | 3 | -38/+76 |
|\ \ \ \ \ \ \ |