summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Ukhlov <dukhlov@mirantis.com>2015-10-16 18:05:42 +0300
committerDmitriy Ukhlov <dukhlov@mirantis.com>2015-10-16 18:05:42 +0300
commit1e643aaad77a2dd79e4a4d1cf349a78ff715b9bb (patch)
tree1b3b4a6f90d0091c00404c5915d8641116fb14b2
parent727db6d645c1783ff43a144f4c93ea1fe17c6e28 (diff)
parenta7d1780639ed3a271eb4cd52bfb7faaf1b76261f (diff)
Merge remote-tracking branch 'origin/master'
Conflicts: devstack/plugin.sh
0 files changed, 0 insertions, 0 deletions