tree 27135f843e0a68f8f15f36828dea268b38c63802
parent 8cf106cb3619dfb7d82e9c58c0c1c9a7162aa052
parent d18fec1de70f7b50be1f4f7fbea192d2519a2121
author Jenkins <jenkins@review.openstack.org> 1412014015 +0000
committer Gerrit Code Review <review@openstack.org> 1412014015 +0000

Merge "Javelin: enable volume resources"