tree cfb325f874ba88524c02ee73b98563899d901314
parent ccebcd1759644e17a5c549a787fb9c0ce5a698e7
author Joe Gordon <jogo@cloudscaling.com> 1364233035 -0400
committer Joe Gordon <jogo@cloudscaling.com> 1364237139 -0400

Fix SimpleReadOnlyNovaManageTest.test_flavor_list CLI test

'nova-manage flavor list' should equal 'nova-manage instance_type list'

Adds an option, merge_stderr, that when enabled redirects stderr to
stdout.

Fix bug 1159914

Change-Id: Icfb93f3fd1f1d6f14a73b4873a6dad36122d3a98