summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Expand)AuthorAgeFilesLines
* Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0231-58/+73
* Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-027-68/+195
|\
| * Always retry hanging jobsJon Bratseth2017-12-182-35/+41
| * Compare identity, not principalBjørn Christian Seime2017-12-181-1/+1
| * Support Athenz authentication through x509 certificatesBjørn Christian Seime2017-12-182-20/+142
| * Use AthenzPrincipal to retrieve NToken (ensures that token is verified)Bjørn Christian Seime2017-12-181-4/+2
| * Revert "Revert "Bratseth/tensorflow models""Jon Bratseth2017-12-182-9/+10
| * Revert "Bratseth/tensorflow models"gjoranv2017-12-172-10/+9
| * Merge pull request #4438 from vespa-engine/bratseth/tensorflow-modelsJon Bratseth2017-12-172-9/+10
| |\
| | * Merge with masterJon Bratseth2017-12-1399-1857/+2042
| | |\
| | * | Nonfunctional changes onlyJon Bratseth2017-12-032-9/+10
| * | | Merge pull request #4421 from vespa-engine/jvenstad/zone-cleanup-3Jon Marius Venstad2017-12-149-74/+65
| |\ \ \
* | | | | Split Zones and renamed itJon Marius Venstad2017-12-162-6/+6
* | | | | Name change of local variableJon Marius Venstad2017-12-152-7/+7
* | | | | Changes to Zones, a MockZones and some usagesJon Marius Venstad2017-12-155-14/+14
* | | | | Conflict resolvedJon Marius Venstad2017-12-148-30/+114
|\| | | |
| * | | | Merge pull request #4440 from vespa-engine/mpolden/remove-all-instances-on-de...Jon Bratseth2017-12-142-24/+53
| |\ \ \ \
| | * | | | Delete all instances on application deleteMartin Polden2017-12-142-24/+53
| | | |_|/ | | |/| |
| * | | | Merge pull request #4433 from vespa-engine/mpolden/expose-assigned-rotation-i...Jon Bratseth2017-12-134-5/+12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Expose assigned rotation in application APIMartin Polden2017-12-134-5/+12
| * | | | Merge pull request #4432 from vespa-engine/bjorncs/athenz-trust-storeMorten Tokle2017-12-131-0/+45
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add trust store configurator with Athenz CA certificatesBjørn Christian Seime2017-12-121-0/+45
| * | | | Use default instances of KeyManagerFactory and TrustManagerFactoryBjørn Christian Seime2017-12-131-2/+2
| * | | | Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-132-0/+90
| * | | | Make credentials expiry configurableBjørn Christian Seime2017-12-133-6/+14
| * | | | Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-134-6/+122
| * | | | Revert "Bjorncs/athenz ssl context"Arnstein Ressem2017-12-125-222/+9
| |/ / /
* | / / Moved ZoneId to controller-api and added ZonesJon Marius Venstad2017-12-1430-59/+42
| |/ / |/| |
* | | Optional<Duration> againJon Marius Venstad2017-12-146-10/+7
* | | Need new classes for hosted compilationJon Marius Venstad2017-12-128-15/+225
|\| |
| * | Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-122-0/+89
| * | Make credentials expiry configurableBjørn Christian Seime2017-12-123-6/+14
| * | Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-124-6/+122
| * | Revert "Add getIdentityCertificate and getRoleCertificate to ZtsClient"Arnstein Ressem2017-12-115-219/+9
| * | Merge pull request #4408 from vespa-engine/mpolden/enable-dns-updateMartin Polden2017-12-113-6/+3
| |\ \
| | * | Reduce maintenance interval for debugging purposesMartin Polden2017-12-111-1/+1
| | * | Revert "Log DNS update"Martin Polden2017-12-112-5/+2
| * | | Merge pull request #4385 from vespa-engine/bjorncs/retrieve-athenz-tls-certBjørn Christian Seime2017-12-115-9/+219
| |\ \ \
| | * | | Add provider for SSLContext configured with Athenz certsBjørn Christian Seime2017-12-112-0/+86
| | * | | Make credentials expiry configurableBjørn Christian Seime2017-12-083-6/+14
| | * | | Add getIdentityCertificate and getRoleCertificate to ZtsClientBjørn Christian Seime2017-12-074-6/+122
* | | | | Added new secure config server uri stuffJon Marius Venstad2017-12-121-4/+6
* | | | | Reintroduced Optional for default region and made mock consistentJon Marius Venstad2017-12-126-7/+27
* | | | | DeploymentId beautificationJon Marius Venstad2017-12-122-8/+8
* | | | | Fix mock, move kibana stuff to hosted and add some docJon Marius Venstad2017-12-122-23/+12
* | | | | More simplificationsJon Marius Venstad2017-12-113-13/+8
* | | | | Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneIdJon Marius Venstad2017-12-114-24/+14
* | | | | Replaced ZoneId getZone(ZoneId zoneId) with hasZone(ZoneId zoneId)Jon Marius Venstad2017-12-117-22/+20
|/ / / /
* | | | More Zone -> ZoneIdJon Marius Venstad2017-12-111-2/+2
* | | | Changed to ZoneId in DnsMaintainerTest as wellJon Marius Venstad2017-12-111-2/+3