lp:~citrix-openstack/glance/iso-boot

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/glance/trunk at revision 137

Brian Waldon (community): Approve on 2011-05-31

Jay Pipes (community): Approve on 2011-05-27

Diff: 151 lines (+75/-4)

6 files modified

doc/source/formats.rst (+4/-0)
doc/source/glanceapi.rst (+1/-1)
doc/source/registries.rst (+1/-1)
glance/registry/db/api.py (+2/-1)
tests/stubs.py (+0/-1)
tests/unit/test_clients.py (+67/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

126. By Donal Lafferty on 2011-05-27

Correct documentation.

125. By Donal Lafferty on 2011-05-27

Remove changes to stub database.

124. By Donal Lafferty on 2011-05-26

Fix accidental delete.

123. By Donal Lafferty on 2011-05-26

Remove additions to FIXTURES in test/stubs.py, which requried changes elsewhere.

122. By Donal Lafferty on 2011-05-26

Sync with trunk.

121. By Donal Lafferty on 2011-05-19

Updated doc with 'iso' disk_format.

120. By Donal Lafferty on 2011-05-19

Update documentation.

119. By Donal Lafferty on 2011-05-19

Merge changes.
Update tests. New image indexes relative to existing indexes.

118. By Donal Lafferty on 2011-05-17

Add tests for 'iso' image type.
Remove hard coding of next available image id in tests. This prevents new test images from being added to the set generated by tests.unit.stubs.FakeDatastore

117. By Donal Lafferty on 2011-05-17

Merge latest with latest Glance.