tree ce347edb31f3f832522a1ff387661f9eca19f8a8
parent 31a91ee725fb8aed64cfef569f3e04c920d19bfb
parent 7a2348bca6ee20e82144033e2da1305427f156c7
author Jenkins <jenkins@review.openstack.org> 1415799319 +0000
committer Gerrit Code Review <review@openstack.org> 1415799319 +0000

Merge "javelin: add network and secgroup resources"