merge from master as of icehouse release - ironic:SSH_port, neutron:VPNaas, rsyslog conservatism#54

Closed

nimbosa wants to merge 10 commits intoopenstack:stable/icehousefrom

Commits on Apr 9, 2014

update stack.sh to use openstack-icehouse repos
nimbosa
committed

Commits on Apr 10, 2014

Devstack support for Neutron VPNaaS
Paul Michali
committed

Commits on Apr 14, 2014

Remove sshd reconfig from lib/ironic
gandelman-a
committed

Commits on Apr 17, 2014

Do not modify rsyslog files if rsyslog is not used.
Yves-Gwenael Bourhis
committed
Merge "Remove sshd reconfig from lib/ironic"

Jenkins
authored and
openstack-gerrit
committed
Merge "Devstack support for Neutron VPNaaS"

Jenkins
authored and
openstack-gerrit
committed
Merge "Do not modify rsyslog files if rsyslog is not used."

Jenkins
authored and
openstack-gerrit
committed

Commits on Apr 19, 2014