summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Export package 'com.yahoo.vespa.athenz.client.zms'Bjørn Christian Seime2018-10-251-0/+8
|/ / / /
* | | | Merge pull request #7444 from vespa-engine/mpolden/controller-aclsMartin Polden2018-10-256-115/+55
|\ \ \ \
| * | | | Update REST API testMartin Polden2018-10-252-42/+19
| * | | | Simplify assertionsMartin Polden2018-10-251-16/+4
| * | | | Remove ACL support for host node typesMartin Polden2018-10-252-70/+6
| * | | | Support ACLs for controllers and hostsMartin Polden2018-10-252-9/+50
| * | | | Remove unused parameterMartin Polden2018-10-252-4/+2
* | | | | Merge pull request #7443 from vespa-engine/mpolden/remove-unused-apiJon Marius Venstad2018-10-253-41/+4
|\ \ \ \ \
| * | | | | Remove unused test responseMartin Polden2018-10-252-8/+1
| * | | | | Remove unused API pathMartin Polden2018-10-252-33/+3
* | | | | | Merge pull request #7440 from vespa-engine/hmusum/avoid-using-static-portHarald Musum2018-10-252-38/+56
|\ \ \ \ \ \
| * | | | | | Use dynamic port in testsHarald Musum2018-10-242-38/+56
* | | | | | | Merge pull request #7418 from vespa-engine/gv/run-tests-in-bootstrapgjoranv2018-10-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Do not skip tests in bootstrap.shgjoranv2018-10-231-1/+1
* | | | | | | | Merge pull request #7445 from vespa-engine/balder/gc-unused-importsJon Bratseth2018-10-253-6/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | GC unused imports.Henning Baldersheim2018-10-253-6/+18
|/ / / / / / /
* | | | | | | Merge pull request #7438 from vespa-engine/bjorncs/g1gcMorten Tokle2018-10-252-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Setting NewRatio is not recommended for G1Bjørn Christian Seime2018-10-242-2/+2
| * | | | | | Use G1GC as defaultBjørn Christian Seime2018-10-241-1/+1
* | | | | | | Merge pull request #7426 from vespa-engine/freva/reboot-containerValerij Fredriksen2018-10-2526-606/+256
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Implement container rebootValerij Fredriksen2018-10-242-0/+36
| * | | | | | Only update fields that have changed. Simplify NodeAgentImptTest.Valerij Fredriksen2018-10-243-82/+32
| * | | | | | Rewrite integration tests to use mockitoValerij Fredriksen2018-10-2411-485/+151
| * | | | | | Use latest mockitoValerij Fredriksen2018-10-2413-39/+37
* | | | | | | Added API for updating metrics on controller (#7378)olaaun2018-10-253-0/+313
* | | | | | | Merge pull request #7436 from vespa-engine/bjorncs/athenz-okta-tenancyMorten Tokle2018-10-2553-784/+952
|\ \ \ \ \ \ \
| * | | | | | | Remove unused parameters from athenz.defBjørn Christian Seime2018-10-241-29/+0
| * | | | | | | Create Athenz tenancy using OktaBjørn Christian Seime2018-10-2427-567/+344
| * | | | | | | Add ZmsClient and DefaultZmsClientBjørn Christian Seime2018-10-2411-0/+494
| * | | | | | | Create ClientBase containing common Athenz client logicBjørn Christian Seime2018-10-2413-84/+114
| * | | | | | | Remove UserAuthWithAthenzPrincipalFilterBjørn Christian Seime2018-10-181-104/+0
* | | | | | | | Merge pull request #7441 from vespa-engine/revert-7437-revert-7423-hmusum/rem...Harald Musum2018-10-253-25/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Revert "No need for restricting access to zookeeper in hosted vespa""Harald Musum2018-10-243-25/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #7439 from vespa-engine/revert-7408-balder/send-in-own-threadHenning Baldersheim2018-10-242-10/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Balder/send in own thread"Henning Baldersheim2018-10-242-10/+39
|/ / / / / / / /
* | | | | | | | Merge pull request #7435 from vespa-engine/balder/stabilize-test-with-race-co...Henning Baldersheim2018-10-2412-103/+139
|\ \ \ \ \ \ \ \
| * | | | | | | | No wildcard import.Henning Baldersheim2018-10-241-2/+13
| * | | | | | | | GC unused fieldHenning Baldersheim2018-10-241-2/+0
| * | | | | | | | No wildcard import.Henning Baldersheim2018-10-241-4/+1
| * | | | | | | | No wildcard import.Henning Baldersheim2018-10-241-2/+15
| * | | | | | | | Must handle concurrent access.Henning Baldersheim2018-10-241-3/+14
| * | | | | | | | Move ThreadedFeedAccess out as independent class.Henning Baldersheim2018-10-243-79/+83
| * | | | | | | | GC unused imports + finalHenning Baldersheim2018-10-244-11/+13
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #7437 from vespa-engine/revert-7423-hmusum/remove-check-fo...Jon Bratseth2018-10-243-8/+25
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Revert "No need for restricting access to zookeeper in hosted vespa"Harald Musum2018-10-243-8/+25
|/ / / / / / /
* | | | | | | Merge pull request #7423 from vespa-engine/hmusum/remove-check-for-allowed-zk...Jon Bratseth2018-10-243-25/+8
|\ \ \ \ \ \ \
| * | | | | | | No need for restricting access to zookeeper in hosted vespaHarald Musum2018-10-233-25/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #7434 from vespa-engine/jvenstad/throw-and-catchJon Bratseth2018-10-243-11/+9
|\ \ \ \ \ \ \
| * | | | | | | Catch the right exceptionJon Marius Venstad2018-10-243-11/+9
* | | | | | | | Merge pull request #7420 from vespa-engine/lesters/dont-retrieve-search-api-d...gjoranv2018-10-242-0/+1917
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |