aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SimplifyMartin Polden2019-04-172-30/+11
|
* Merge pull request #9139 from vespa-engine/mortent/allow-multiple-rolesJon Marius Venstad2019-04-162-4/+19
|\ | | | | Allow principal to have both tenantadmin and deployer roles
| * Allow principal to have both tenantadmin and deployer rolesMorten Tokle2019-04-162-4/+19
| |
* | Merge pull request #9138 from vespa-engine/bjorncs/python3-1Arnstein Ressem2019-04-162-115/+4
|\ \ | |/ |/| Delete cppunit-parallelize.py
| * Migrate script ot Python 3Bjørn Christian Seime2019-04-161-4/+4
| |
| * Delete cppunit-parallelize.pyBjørn Christian Seime2019-04-161-111/+0
|/ | | No longer in use
* Merge pull request #9136 from ↵Tor Egge2019-04-1615-1460/+977
|\ | | | | | | | | vespa-engine/toregge/migrate-document-unit-tests-from-cppunit-to-gtest-1 Migrate document unit tests from cppunit to gtest.
| * Migrate document unit tests from cppunit to gtest.Tor Egge2019-04-1615-1460/+977
|/
* Merge pull request #9133 from vespa-engine/toregge/style-fixes-for-searchlib-2Tor Egge2019-04-1531-263/+437
|\ | | | | Style fixes.
| * Style fixes.Tor Egge2019-04-154-6/+8
| |
| * Style fixes.Tor Egge2019-04-1531-264/+436
| |
* | Merge pull request #9135 from vespa-engine/revert-9131-bjorncs/jettyMorten Tokle2019-04-156-6/+6
|\ \ | | | | | | Revert "Upgrade Jetty to 9.4.16"
| * | Revert "Upgrade Jetty to 9.4.16"Bjørn Christian Seime2019-04-156-6/+6
|/ /
* | Merge pull request #9134 from vespa-engine/balder/control-number-of-feed-threadsBjørn Christian Seime2019-04-158-22/+51
|\ \ | | | | | | Add control for number of feed threads.
| * | Add control for number of feed threads.Henning Baldersheim2019-04-158-22/+51
| | |
* | | Merge pull request #9132 from vespa-engine/mpolden/include-rotation-id-in-deployMartin Polden2019-04-153-1/+24
|\ \ \ | |_|/ |/| | Include rotation ID in rotation CNAMEs passed to config server
| * | Include rotation ID in rotation CNAMEs passed to config serverMartin Polden2019-04-153-1/+24
| | |
* | | Merge pull request #9130 from vespa-engine/toregge/style-fixes-for-searchlib-1Tor Egge2019-04-1547-754/+191
|\ \ \ | | | | | | | | Style fixes for searchlib
| * | | Style fixes.Tor Egge2019-04-156-7/+7
| | | |
| * | | Style fixes.Tor Egge2019-04-1543-439/+190
| | | |
| * | | Remove unused code.Tor Egge2019-04-154-314/+0
| | | |
* | | | Merge pull request #9131 from vespa-engine/bjorncs/jettyBjørn Christian Seime2019-04-156-6/+6
|\ \ \ \ | | | | | | | | | | Upgrade Jetty to 9.4.16
| * | | | Upgrade Jetty to 9.4.16Bjørn Christian Seime2019-04-156-6/+6
| |/ / / | | | | | | | | | | | | | | | | Use Server subclass as default constructor of SslContextFactory and some methods are marked as deprecated.
* | | | Merge pull request #9129 from ↵Jon Marius Venstad2019-04-1525-393/+323
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/really-hide-system-in-role-API Jvenstad/really hide system in role api
| * | | | Update some docJon Marius Venstad2019-04-154-5/+5
| | | | |
| * | | | Make things less publicJon Marius Venstad2019-04-155-24/+24
| | | | |
| * | | | Call enforcer.allows rather than role.allows(..., enforcer)Jon Marius Venstad2019-04-153-23/+18
| | | | |
| * | | | Make Roles staticJon Marius Venstad2019-04-155-53/+33
| | | | |
| * | | | UserRoles -> RolesJon Marius Venstad2019-04-154-27/+27
| | | | |
| * | | | Replace Roles with static factories in RoleJon Marius Venstad2019-04-1514-215/+150
| | | | |
| * | | | Remove system from Context and rolesJon Marius Venstad2019-04-155-39/+31
| | | | |
| * | | | Use system from enforcer, not context, when enforcing policiesJon Marius Venstad2019-04-155-25/+53
| |/ / /
* | | | Merge pull request #9128 from ↵Jon Marius Venstad2019-04-151-3/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/jvenstad/timeout-system-job-before-expiry Time out jobs before deployment expires, to get Vespa log
| * | | Explain timeoutJon Marius Venstad2019-04-151-1/+7
| | | |
| * | | Time out jobs before deployment expires, to get Vespa logJon Marius Venstad2019-04-151-2/+5
| | | |
* | | | Merge pull request #9112 from vespa-engine/jvenstad/find-implied-rolesMorten Tokle2019-04-154-21/+74
|\ \ \ \ | |/ / / |/| | | List implied roles in Controller
| * | | Update test dataJon Marius Venstad2019-04-122-16/+37
| | | |
| * | | Order most important role members firstJon Marius Venstad2019-04-121-1/+2
| | | |
| * | | List implied roles as well, in user management APIJon Marius Venstad2019-04-121-4/+11
| | | |
| * | | List implied roles in ControllerJon Marius Venstad2019-04-121-0/+24
| | | |
* | | | Merge pull request #9127 from ↵Henning Baldersheim2019-04-145-27/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9126-balder/skip-the-messenger-thread Revert "Balder/skip the messenger thread"
| * | | | Revert "Balder/skip the messenger thread"Henning Baldersheim2019-04-145-27/+60
|/ / / /
* | | | Merge pull request #9126 from vespa-engine/balder/skip-the-messenger-threadHenning Baldersheim2019-04-145-60/+27
|\ \ \ \ | | |_|/ | |/| | Balder/skip the messenger thread
| * | | Add control for if you want to use mbus threas for compression/encoding or ↵Henning Baldersheim2019-04-144-3/+20
| | | | | | | | | | | | | | | | your own.
| * | | Handle the reply in own thread too.Henning Baldersheim2019-04-131-26/+5
| | | |
| * | | Send the message in your own thread.Henning Baldersheim2019-04-131-31/+2
|/ / /
* | | Merge pull request #9125 from vespa-engine/revert-9103-balder/send-selfHenning Baldersheim2019-04-131-2/+31
|\ \ \ | | | | | | | | Revert "Revert "Revert "Balder/send in own thread"""
| * | | Revert "Revert "Revert "Balder/send in own thread"""Henning Baldersheim2019-04-131-2/+31
|/ / /
* | | Merge pull request #9124 from vespa-engine/balder/use-a-modifiable-listHenning Baldersheim2019-04-131-1/+2
|\ \ \ | | | | | | | | Use a modifiable list.
| * | | Use a modifiable list.Henning Baldersheim2019-04-131-1/+2
|/ / /