tree f6f652b2418bd023c185f7eaa9e1b619903033e0
parent 8e162903cf1be039a8ad34b502ff01407263c97b
parent f2d2d9feeeb553c98d3faf5b712c85ab848bcdf7
author David Pursehouse <dpursehouse@collab.net> 1545352765 +0900
committer David Pursehouse <dpursehouse@collab.net> 1545352765 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Make the index striped locks size configurable

Change-Id: Id50b81a6fb7b9862c7ff8b89f798a8d47b79788f