tree 45c2aea4b22192cfc45e79d787f533019e021c59
parent 70fb4bcec7b1fe72744159b65e91c347a1fb904d
parent ed3a9e60ae9fddd29c743847d853c35184a63530
author Richard Felkl <rfelkl@mirantis.com> 1519210102 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> 1519210102 +0000

Merge "upgrade from Ocata/Pike"