lp:~vishvananda/nova/project-vpns

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 477

Eric Day (community): Approve on 2010-12-22

Soren Hansen (community): Approve on 2010-12-19

Todd Willey (community): Needs Fixing on 2010-11-17

Diff: 1490 lines (+642/-310)

19 files modified

CA/geninter.sh (+17/-9)
CA/genrootca.sh (+1/-0)
CA/genvpn.sh (+36/-0)
CA/openssl.cnf.tmpl (+2/-1)
bin/nova-manage (+52/-32)
nova/api/__init__.py (+1/-3)
nova/api/cloudpipe/__init__.py (+0/-69)
nova/api/ec2/cloud.py (+10/-6)
nova/auth/manager.py (+43/-37)
nova/cloudpipe/bootscript.template (+16/-29)
nova/cloudpipe/pipelib.py (+85/-42)
nova/crypto.py (+150/-43)
nova/db/api.py (+48/-2)
nova/db/sqlalchemy/api.py (+103/-11)
nova/db/sqlalchemy/models.py (+11/-1)
nova/flags.py (+12/-6)
nova/network/linux_net.py (+2/-4)
nova/tests/auth_unittest.py (+7/-10)
nova/utils.py (+46/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

410. By Vish Ishaya on 2010-12-22

merged i8n and fixed conflicts

409. By Vish Ishaya on 2010-12-21

update db/api.py as well

408. By Vish Ishaya on 2010-12-21

don't allocate networks when getting vpn info

407. By Vish Ishaya on 2010-12-17

pep8

406. By Vish Ishaya on 2010-12-17

move some flags around

405. By Vish Ishaya on 2010-12-16

merged trunk, fixed conflicts and tests

404. By Vish Ishaya on 2010-12-16

use getent, update docstring

403. By Vish Ishaya on 2010-11-29

merged trunk

402. By Vish Ishaya on 2010-11-24

don't error on edge case where vpn has been launched but fails to get a network

401. By Vish Ishaya on 2010-11-23

add vpn ping and optimize vpn list