Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Revert "Revert "Revert "Revert "Jvenstad/zone cleanup 4"""" | Jon Marius Venstad | 2018-01-03 | 31 | -73/+58 | |
| | | | | | | | | This reverts commit 7b99d259bf378c0e5c43c9a199efffdf056678f4. | |||||
* | | Revert "Revert "Revert "Jvenstad/zone cleanup 4""" | Harald Musum | 2018-01-02 | 31 | -58/+73 | |
|/ | ||||||
* | Revert "Revert "Jvenstad/zone cleanup 4"" | Jon Marius Venstad | 2018-01-02 | 31 | -73/+58 | |
| | ||||||
* | Revert "Jvenstad/zone cleanup 4" | Jon Marius Venstad | 2018-01-02 | 31 | -58/+73 | |
| | ||||||
* | Merge branch 'master' into jvenstad/zone-cleanup-4 | Jon Marius Venstad | 2018-01-02 | 7 | -68/+195 | |
|\ | ||||||
| * | Always retry hanging jobs | Jon Bratseth | 2017-12-18 | 2 | -35/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | Hanging jobs will usually be implicitly retried, since they will not be taken as running. However, they will not be retried if the outcome of completing the job will be unchanged. Such jobs still need to complete, to trigger the next step, such that we can eventually trigger the downstream jobs which need to run to complete the ongoing change (arguably we could skip the job in these cases, but currently we don't). | |||||
| * | Compare identity, not principal | Bjørn Christian Seime | 2017-12-18 | 1 | -1/+1 | |
| | | ||||||
| * | Support Athenz authentication through x509 certificates | Bjørn Christian Seime | 2017-12-18 | 2 | -20/+142 | |
| | | ||||||
| * | Use AthenzPrincipal to retrieve NToken (ensures that token is verified) | Bjørn Christian Seime | 2017-12-18 | 1 | -4/+2 | |
| | | ||||||
| * | Revert "Revert "Bratseth/tensorflow models"" | Jon Bratseth | 2017-12-18 | 2 | -9/+10 | |
| | | ||||||
| * | Revert "Bratseth/tensorflow models" | gjoranv | 2017-12-17 | 2 | -10/+9 | |
| | | ||||||
| * | Merge pull request #4438 from vespa-engine/bratseth/tensorflow-models | Jon Bratseth | 2017-12-17 | 2 | -9/+10 | |
| |\ | | | | | | | Bratseth/tensorflow models | |||||
| | * | Merge with master | Jon Bratseth | 2017-12-13 | 98 | -1857/+2041 | |
| | |\ | ||||||
| | * | | Nonfunctional changes only | Jon Bratseth | 2017-12-03 | 2 | -9/+10 | |
| | | | | ||||||
| * | | | Merge pull request #4421 from vespa-engine/jvenstad/zone-cleanup-3 | Jon Marius Venstad | 2017-12-14 | 9 | -74/+65 | |
| |\ \ \ | | | | | | | | | | | Jvenstad/zone cleanup 3 | |||||
* | | | | | Split Zones and renamed it | Jon Marius Venstad | 2017-12-16 | 2 | -6/+6 | |
| | | | | | ||||||
* | | | | | Name change of local variable | Jon Marius Venstad | 2017-12-15 | 2 | -7/+7 | |
| | | | | | ||||||
* | | | | | Changes to Zones, a MockZones and some usages | Jon Marius Venstad | 2017-12-15 | 5 | -14/+14 | |
| | | | | | ||||||
* | | | | | Conflict resolved | Jon Marius Venstad | 2017-12-14 | 8 | -30/+114 | |
|\| | | | | ||||||
| * | | | | Merge pull request #4440 from ↵ | Jon Bratseth | 2017-12-14 | 2 | -24/+53 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/remove-all-instances-on-delete Delete all instances on application delete | |||||
| | * | | | | Delete all instances on application delete | Martin Polden | 2017-12-14 | 2 | -24/+53 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | Merge pull request #4433 from ↵ | Jon Bratseth | 2017-12-13 | 4 | -5/+12 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | vespa-engine/mpolden/expose-assigned-rotation-in-api Expose assigned rotation in application API | |||||
| | * | | | Expose assigned rotation in application API | Martin Polden | 2017-12-13 | 4 | -5/+12 | |
| | | | | | ||||||
| * | | | | Merge pull request #4432 from vespa-engine/bjorncs/athenz-trust-store | Morten Tokle | 2017-12-13 | 1 | -0/+45 | |
| |\ \ \ \ | | |/ / / | |/| | | | Add trust store configurator with Athenz CA certificates | |||||
| | * | | | Add trust store configurator with Athenz CA certificates | Bjørn Christian Seime | 2017-12-12 | 1 | -0/+45 | |
| | | | | | ||||||
| * | | | | Use default instances of KeyManagerFactory and TrustManagerFactory | Bjørn Christian Seime | 2017-12-13 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Add provider for SSLContext configured with Athenz certs | Bjørn Christian Seime | 2017-12-13 | 2 | -0/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates. | |||||
| * | | | | Make credentials expiry configurable | Bjørn Christian Seime | 2017-12-13 | 3 | -6/+14 | |
| | | | | | ||||||
| * | | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | Bjørn Christian Seime | 2017-12-13 | 4 | -6/+122 | |
| | | | | | ||||||
| * | | | | Revert "Bjorncs/athenz ssl context" | Arnstein Ressem | 2017-12-12 | 5 | -222/+9 | |
| |/ / / | ||||||
* | / / | Moved ZoneId to controller-api and added Zones | Jon Marius Venstad | 2017-12-14 | 30 | -59/+42 | |
| |/ / |/| | | ||||||
* | | | Optional<Duration> again | Jon Marius Venstad | 2017-12-14 | 6 | -10/+7 | |
| | | | ||||||
* | | | Need new classes for hosted compilation | Jon Marius Venstad | 2017-12-12 | 8 | -15/+225 | |
|\| | | ||||||
| * | | Add provider for SSLContext configured with Athenz certs | Bjørn Christian Seime | 2017-12-12 | 2 | -0/+89 | |
| | | | | | | | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates. | |||||
| * | | Make credentials expiry configurable | Bjørn Christian Seime | 2017-12-12 | 3 | -6/+14 | |
| | | | ||||||
| * | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | Bjørn Christian Seime | 2017-12-12 | 4 | -6/+122 | |
| | | | ||||||
| * | | Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient" | Arnstein Ressem | 2017-12-11 | 5 | -219/+9 | |
| | | | ||||||
| * | | Merge pull request #4408 from vespa-engine/mpolden/enable-dns-update | Martin Polden | 2017-12-11 | 3 | -6/+3 | |
| |\ \ | | | | | | | | | Enable DNS update | |||||
| | * | | Reduce maintenance interval for debugging purposes | Martin Polden | 2017-12-11 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Revert "Log DNS update" | Martin Polden | 2017-12-11 | 2 | -5/+2 | |
| | | | | | | | | | | | | | | | | This reverts commit adae0a8419978d3bc9f0a752d89fd8abc95718e1. | |||||
| * | | | Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-cert | Bjørn Christian Seime | 2017-12-11 | 5 | -9/+219 | |
| |\ \ \ | | | | | | | | | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | |||||
| | * | | | Add provider for SSLContext configured with Athenz certs | Bjørn Christian Seime | 2017-12-11 | 2 | -0/+86 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provided SSLContext is configured with a keystore containing the Athenz service certificate and a trust store containing the Athenz CA certificates. | |||||
| | * | | | Make credentials expiry configurable | Bjørn Christian Seime | 2017-12-08 | 3 | -6/+14 | |
| | | | | | ||||||
| | * | | | Add getIdentityCertificate and getRoleCertificate to ZtsClient | Bjørn Christian Seime | 2017-12-07 | 4 | -6/+122 | |
| | | | | | ||||||
* | | | | | Added new secure config server uri stuff | Jon Marius Venstad | 2017-12-12 | 1 | -4/+6 | |
| | | | | | ||||||
* | | | | | Reintroduced Optional for default region and made mock consistent | Jon Marius Venstad | 2017-12-12 | 6 | -7/+27 | |
| | | | | | ||||||
* | | | | | DeploymentId beautification | Jon Marius Venstad | 2017-12-12 | 2 | -8/+8 | |
| | | | | | ||||||
* | | | | | Fix mock, move kibana stuff to hosted and add some doc | Jon Marius Venstad | 2017-12-12 | 2 | -23/+12 | |
| | | | | | ||||||
* | | | | | More simplifications | Jon Marius Venstad | 2017-12-11 | 3 | -13/+8 | |
| | | | | | ||||||
* | | | | | Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneId | Jon Marius Venstad | 2017-12-11 | 4 | -24/+14 | |
| | | | | |