lp:~elopio/canonical-identity-provider/liveserver

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:canonical-identity-provider/release

Canonical ISD hackers: Pending requested 2013-06-10

Diff: 64 lines (+34/-2)

2 files modified

acceptance/tests/consumer/testcases/test_teams_data.py (+33/-2)
django_project/config_dev/config/main.cfg (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

932. By Leo Arias on 2013-06-10

Rolled back the change brand exception.

931. By Leo Arias on 2013-06-10

Rolled back the brand switch skip.

930. By Leo Arias on 2013-06-10

Removed the LiveServer and the database flush as suggested by nessita.

929. By Leo Arias on 2013-06-10

Removed unnecessary init.

928. By Leo Arias on 2013-06-10

Merged with trunk.

927. By Leo Arias on 2013-06-10

Fixed pep8.

926. By Leo Arias on 2013-06-10

Added root_urlconf as suggested by pindonga.

925. By Leo Arias on 2013-06-10

Added the comments suggested by vila.

924. By Leo Arias on 2013-06-10

Inverted the order of database cleanup.

923. By Leo Arias on 2013-06-10

Added the fixtures to the test_teams_data.