comparison rhodecode/websetup.py @ 3700:3563bb7b4b82

merge with rc1
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 07 Apr 2013 18:37:22 +0200
parents a5f0bc867edc 99c093d1a142
children ffd45b185016
comparison
equal deleted inserted replaced
3525:0cef54d34605 3700:3563bb7b4b82
46 dbmanage.admin_prompt() 46 dbmanage.admin_prompt()
47 dbmanage.create_permissions() 47 dbmanage.create_permissions()
48 dbmanage.populate_default_permissions() 48 dbmanage.populate_default_permissions()
49 Session().commit() 49 Session().commit()
50 load_environment(conf.global_conf, conf.local_conf, initial=True) 50 load_environment(conf.global_conf, conf.local_conf, initial=True)
51 dbmanage.finish() 51 DbManage.check_waitress()