aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.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 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.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.16Bjørn Christian Seime2019-04-156-6/+6
| |/ / /
* | | | Merge pull request #9129 from vespa-engine/jvenstad/really-hide-system-in-rol...Jon Marius Venstad2019-04-1525-393/+323
|\ \ \ \
| * | | | 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 vespa-engine/jvenstad/timeout-system-job-before...Jon Marius Venstad2019-04-151-3/+12
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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 vespa-engine/revert-9126-balder/skip-the-messen...Henning Baldersheim2019-04-145-27/+60
|\ \ \ \
| * | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Add control for if you want to use mbus threas for compression/encoding or yo...Henning Baldersheim2019-04-144-3/+20
| * | | 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"""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.Henning Baldersheim2019-04-131-1/+2
|/ / /
* | | Merge pull request #9123 from vespa-engine/balder/follow-intellij-adviseHenning Baldersheim2019-04-1333-526/+153
|\ \ \
| * | | Remove some unused metrics code and dewire it.Henning Baldersheim2019-04-1331-430/+99
| * | | Follow intellij advise.Henning Baldersheim2019-04-138-102/+60
|/ / /
* | | Merge pull request #9122 from vespa-engine/balder/gc-some-unused-metricsHenning Baldersheim2019-04-138-182/+0
|\ \ \
| * | | GC unused metrics instead of guarding it.Henning Baldersheim2019-04-138-182/+0
|/ / /
* | | Merge pull request #9121 from vespa-engine/balder/some-cleanup-and-thread-saf...Henning Baldersheim2019-04-136-51/+56
|\ \ \
| * | | Use atomic and synchronized sections to do proper accounting of replies. And ...Henning Baldersheim2019-04-136-51/+56
|/ / /
* | | Merge pull request #9120 from vespa-engine/revert-9118-revert-9116-revert-911...Henning Baldersheim2019-04-131-5/+26
|\ \ \
| * | | Revert "Revert "Revert "Reply in own thread"""Henning Baldersheim2019-04-131-5/+26
|/ / /
* | | Merge pull request #9119 from vespa-engine/balder/guard-access-to-metricsHenning Baldersheim2019-04-131-1/+1
|\ \ \
| * | | Since internals here are not thread safe we need to guard it here to.Henning Baldersheim2019-04-131-1/+1
|/ / /
* | | Merge pull request #9118 from vespa-engine/revert-9116-revert-9115-balder/bal...Henning Baldersheim2019-04-131-26/+5
|\ \ \