lp:~bloodearnest/canonical-identity-provider/sso-dev

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:canonical-identity-provider/release

Daniel Manrique (community): Approve on 2015-11-16

Diff: 1052 lines (+803/-37)

16 files modified

.bzrignore (+5/-1)
Makefile (+162/-0)
Makefile.common (+35/-28)
Makefile.juju (+120/-0)
README.juju (+220/-0)
django_project/deploy.yaml (+25/-0)
django_project/paths.py (+3/-1)
django_project/settings_base.py (+1/-1)
django_project/settings_devel_juju.py (+54/-0)
django_project/ssh_config (+8/-0)
requirements_devel.txt (+1/-1)
run-tests-juju (+52/-0)
scripts/acceptance-dev-juju.sh (+66/-0)
scripts/setup-localmail.sh (+47/-0)
src/identityprovider/tests/test_command_cleanup.py (+4/-4)
src/webui/tests/test_views_ui.py (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1383. By Simon Davy on 2016-03-04

fix some small issues from user testing

1382. By Simon Davy on 2016-03-03

merging

1381. By Simon Davy on 2016-01-12

merging

1380. By Simon Davy on 2016-01-12

merging

1379. By Simon Davy on 2015-12-14

merging

1378. By Simon Davy on 2015-12-09

merging

1377. By Simon Davy on 2015-12-08

merging properly this time

1376. By Simon Davy on 2015-12-08

merging

1375. By Simon Davy on 2015-11-23

merging

1374. By Simon Davy on 2015-11-19

make clean now works properly again