← Back to branch summary

~santhoshkumar/network-service/melange_framework

~santhoshkumar/network-service/melange_framework

Viewing all changes in revision 105.

Committer: Santhosh
Date: 2011-07-04 05:10:10 UTC
mfrom: (94.1.3 melange)
Revision ID: santhom@thoughtworks.com-20110704051010-w85g5m7f5j3j02qi

Merge from Rajaram

files modified:
etc/melange.conf.test

melange/db/api.py

melange/db/migrate_repo/schema.py

melange/db/migrate_repo/versions/001_add_ip_blocks_table.py

melange/db/migrate_repo/versions/002_add_ip_addresses_table.py

melange/db/migrate_repo/versions/003_add_type_to_ip_blocks.py

melange/db/migrate_repo/versions/004_add_ip_nat_table.py

melange/db/migrate_repo/versions/007_add_policy_table.py

melange/db/migrate_repo/versions/008_add_ip_ranges_table.py

melange/db/migrate_repo/versions/010_add_ip_octets_table.py

melange/db/session.py

melange/ipam/models.py

tests/unit/__init__.py

tests/unit/test_ipam_models.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

etc/melange.conf.test

melange/db/api.py

melange/db/migrate_repo/schema.py

melange/db/migrate_repo/versions/001_add_ip_blocks_table.py

melange/db/migrate_repo/versions/002_add_ip_addresses_table.py

melange/db/migrate_repo/versions/003_add_type_to_ip_blocks.py

melange/db/migrate_repo/versions/004_add_ip_nat_table.py

melange/db/migrate_repo/versions/007_add_policy_table.py

melange/db/migrate_repo/versions/008_add_ip_ranges_table.py

melange/db/migrate_repo/versions/010_add_ip_octets_table.py

melange/db/session.py

melange/ipam/models.py

tests/unit/__init__.py

tests/unit/test_ipam_models.py

tools/pip-requires

Older »