summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.166.62-1].vespa-6.166.62-1by-screwdriver2017-11-014-1/+2
* Merge pull request #3957 from vespa-engine/revert-3943-toregge/use-standard-l...Håkon Hallingstad2017-10-3128-276/+691
|\
| * Revert "Toregge/use standard locks in fastos"Harald Musum2017-10-3128-276/+691
|/
* Merge pull request #3956 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-10-314-6/+45
|\
| * Generate proper zone dns suffixBjørn Christian Seime2017-10-312-6/+17
| * Flush JcaPEMWriterBjørn Christian Seime2017-10-312-0/+28
|/
* Merge pull request #3955 from vespa-engine/hakonhall/refer-to-correct-bundleBjørn Christian Seime2017-10-311-2/+2
|\
| * Refer to correct bundleHåkon Hallingstad2017-10-311-2/+2
|/
* Merge pull request #3952 from vespa-engine/havardpe/simplify-and-regularize-r...Arne H Juul2017-10-3117-302/+33
|\
| * remove letHåvard Pettersen2017-10-3117-302/+33
|/
* Merge pull request #3951 from vespa-engine/bjorncs/athenz-identity-provider-c...Bjørn Christian Seime2017-10-318-114/+250
|\
| * Add method to parse PEM encoded x509 certificatesBjørn Christian Seime2017-10-271-0/+15
| * Use Jackson object mapping for identity documentBjørn Christian Seime2017-10-272-32/+42
| * Add TODOsBjørn Christian Seime2017-10-271-0/+2
| * Rename AthenzIdentityProviderTest -> AthenzIdentityProviderImplTestBjørn Christian Seime2017-10-272-7/+4
| * Implement ZTS instance refresh requestBjørn Christian Seime2017-10-272-6/+100
| * Move BouncyCastle logic to CryptoUtilsBjørn Christian Seime2017-10-272-67/+85
| * Remove unnecessary public modifierBjørn Christian Seime2017-10-271-4/+4
* | Merge pull request #3943 from vespa-engine/toregge/use-standard-locks-in-fastosHenning Baldersheim2017-10-3128-691/+276
|\ \
| * | Remove FastOS_Mutex and FastOS_Cond.Tor Egge2017-10-307-384/+0
| * | Stop using FastOS_Mutex and FastOS_Cond in fastos unit tests.Tor Egge2017-10-306-113/+115
| * | Remove unused member variable.Tor Egge2017-10-301-2/+0
| * | Use std::mutex and std::condition_variable instead of FastOS_Mutex andTor Egge2017-10-307-97/+91
| * | Remove unneeded includes.Tor Egge2017-10-301-2/+0
| * | Use std::mutex instead of FastOS_Mutex to protect ipc exit flag.Tor Egge2017-10-302-7/+7
| * | Use std::mutex instead of FastOS_Mutex to protect socket event objects.Tor Egge2017-10-302-14/+8
| * | Use std::mutex instead of FastOS_Mutex to protect ring buffer.Tor Egge2017-10-302-23/+7
| * | Use std::mutex instead of FastOS_Mutex to protect process informationTor Egge2017-10-305-51/+50
* | | Merge pull request #3950 from vespa-engine/havardpe/simple-typed-double-optim...Arne H Juul2017-10-317-4/+54
|\ \ \
| * | | simple optimizations for double map/joinHåvard Pettersen2017-10-277-4/+54
* | | | Merge pull request #3937 from vespa-engine/hakonhall/hide-service-monitor-int...Bjørn Christian Seime2017-10-3115-23/+26
|\ \ \ \
| * | | | Hide service monitor internalsHåkon Hallingstad2017-10-2815-23/+26
* | | | | Merge pull request #3933 from vespa-engine/bjorncs/remove-deprecated-authoriz...Bjørn Christian Seime2017-10-315-88/+51
|\ \ \ \ \
| * | | | | Be consistent on curly braces. Remove NPE when not authenticatedBjørn Christian Seime2017-10-311-4/+8
| * | | | | Handle NotAuthorizedException in ApplicationApiHandlerBjørn Christian Seime2017-10-272-1/+11
| * | | | | Cleanup deployment authorizationBjørn Christian Seime2017-10-274-87/+36
* | | | | | Merge pull request #3948 from vespa-engine/mortent/athenz-send-domainBjørn Christian Seime2017-10-311-2/+3
|\ \ \ \ \ \
| * | | | | | Send domain as part of providerserviceMorten Tokle2017-10-311-2/+3
* | | | | | | Merge pull request #3944 from vespa-engine/vekterli/explicitly-log-message-wh...Tor Brede Vekterli2017-10-311-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Log when a cluster state version is publishedTor Brede Vekterli2017-10-301-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3945 from vespa-engine/gjoranv/check-for-null-componentsBjørn Christian Seime2017-10-311-0/+3
|\ \ \ \ \ \
| * | | | | | Throw exception if null componentsConfig.gjoranv2017-10-301-0/+3
| |/ / / / /
* | | | | | Merge pull request #3946 from vespa-engine/hmusum/tenants-cleanupJon Bratseth2017-10-307-73/+60
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Cleanup and make Tenants a bit more readableHarald Musum2017-10-307-73/+60
|/ / / / /
* | | | | Merge pull request #3942 from vespa-engine/jvenstad/display-system-version-in...Jon Bratseth2017-10-304-5/+7
|\ \ \ \ \
| * | | | | Send system version with broken deploymentsJon Marius Venstad2017-10-304-5/+7
* | | | | | Merge pull request #3936 from vespa-engine/toregge/use-standard-locking-in-sl...Arne H Juul2017-10-305-43/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use std::mutex instead of FastOS_Mutex in slobrok and vespalog modules.Tor Egge2017-10-275-43/+36
* | | | | | Merge pull request #3941 from vespa-engine/hmusum/get-optional-before-throwin...Martin Polden2017-10-301-1/+1
|\ \ \ \ \ \
| * | | | | | Get value from optional before throwing exceptionHarald Musum2017-10-301-1/+1