lp:~rvb/maas/dj-migrations

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~maas-committers/maas/trunk

MAAS Maintainers: Pending requested 2015-03-11

Diff: 285 lines (+92/-5) (has conflicts)

8 files modified

Makefile (+2/-1)
src/maas/settings.py (+19/-1)
src/maasserver/fields.py (+23/-1)
src/maasserver/models/node.py (+5/-1)
src/maasserver/plugin.py (+5/-0)
src/maasserver/start_up.py (+12/-0)
src/maasserver/utils/__init__.py (+10/-0)
src/metadataserver/fields.py (+16/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3650. By Raphaël Badin on 2015-07-29

Initial mig.

3649. By Raphaël Badin on 2015-03-19

Regenerate 0001 migrations.

3648. By Raphaël Badin on 2015-03-19

Reset 0001 migration.

3647. By Raphaël Badin on 2015-03-19

Merge trunk.

3646. By Raphaël Badin on 2015-03-19

Reset 0001 migration.

3645. By Raphaël Badin on 2015-03-17

Merge trunk.

3644. By Raphaël Badin on 2015-03-17

Load models import Django 1.7.

3643. By Raphaël Badin on 2015-03-13

Update initial migration.

3642. By Raphaël Badin on 2015-03-13

Merge trunk.

3641. By Raphaël Badin on 2015-03-13

Update migration file.