tree b78380f14bf4d2834410ef2c34970b5b9df7cc98
parent 45b9065e3413e0a523c32384d7f28d16839636c9
parent 87bafc61feb894a060b9337ad3da1db1f6e114c7
author Vladyslav Drok <vdrok@mirantis.com> 1520330431 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> 1520330431 +0000

Merge "Fix for ocata" into mcp/pike