tree 37bb543fd0eeb7c4f6bc91893be9534665856041
parent b38c992eedd9c329984e3a94c388320100e9685f
parent 6b4134bd2d5e5b8ee2e97a047f590c84ea37ea80
author Filip Pytloun <filip@pytloun.cz> 1501509115 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> 1501509116 +0000

Merge "Allow setting more master and minion options"