aboutsummaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-27 07:53:53 +0000
committerGerrit Code Review <review@openstack.org>2014-06-27 07:53:53 +0000
commit9e33760e06116fd44d9766b4b5828a29e69ec736 (patch)
tree194f63f26470757721789dcbb2d321b77fad0bdc /test_merge.bash
parent8fc307cc22da5375e9808ffa853cf1af04554078 (diff)
parent9a3f38a7dfa4664227d642b4db74c42a3a690d2d (diff)
Merge "Set glance protocol and port as Heat configurable"
Diffstat (limited to 'test_merge.bash')
0 files changed, 0 insertions, 0 deletions