tree d7c7333ff566f36737e4aded9d74cb0f2982dc07
parent 95ca02c6c74ff16255ac7ca81a49829116b2449e
parent 6a342b4b807318a17b43eed63f104fed72ddbb43
author Jakub Pavlik <pavlk.jakub@gmail.com> 1498048973 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1498048976 +0000

Merge changes I1de87d4c,I04c3405c

* changes:
  Add solidfire storage
  Add include to enable monitoring