lp://staging/~jaypipes/glance/versioning

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~glance-coresec/glance/cactus-trunk at revision 58

Rick Harris (community): Approve on 2011-01-30

Vish Ishaya (community): Approve on 2011-01-27

Devin Carlen (community): Approve on 2011-01-27

Monty Taylor: Pending requested 2011-01-27

Diff: 769 lines (+214/-79)

23 files modified

bin/glance-api (+8/-8)
bin/glance-registry (+10/-8)
doc/source/conf.py (+5/-3)
glance/__init__.py (+16/-0)
glance/client.py (+1/-1)
glance/common/__init__.py (+16/-0)
glance/common/db/__init__.py (+2/-1)
glance/common/db/sqlalchemy/__init__.py (+16/-0)
glance/common/db/sqlalchemy/session.py (+1/-0)
glance/registry/db/__init__.py (+2/-1)
glance/registry/db/api.py (+2/-0)
glance/registry/db/sqlalchemy/api.py (+2/-0)
glance/registry/server.py (+1/-1)
glance/version.py (+46/-0)
setup.py (+22/-11)
tests/__init__.py (+16/-0)
tests/stubs.py (+2/-4)
tests/unit/__init__.py (+16/-0)
tests/unit/test_api.py (+7/-11)
tests/unit/test_clients.py (+14/-20)
tests/unit/test_registry_api.py (+6/-6)
tests/unit/test_stores.py (+1/-2)
tools/install_venv.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

57. By Jay Pipes on 2011-01-27

Merge Bexar r56

56. By Jay Pipes on 2011-01-27

Makes Glance's versioning non-static. Uses Nova's versioning scheme.

55. By Jay Pipes on 2011-01-27

version bumped after tarball cut. no review needed...

54. By Josh Kearney on 2011-01-26

PEP8 cleanup.

53. By Monty Taylor on 2011-01-26

Should fix the sphinx issue.

52. By Jay Pipes on 2011-01-26

Adds architecture docs and enables Graphviz sphinx extension. Also cleans up source code formatting in docs.

51. By Jay Pipes on 2011-01-25

bumps version after tarball release of 0.1.4

50. By Jay Pipes on 2011-01-24

bumps release version. ready for Bexar final release.

no need to review...just sending this to trunk now.

49. By Ken Pepple on 2011-01-23

added sphinx and argparse into tools/pip-requires so that setup.py works.
this bug also prevents nova from creating a virtualenv.

48. By Jay Pipes on 2011-01-23

Fixes bug #706636: Make sure pep8 failures will return failure for run_tests.sh