Merge branch 'master' of github.com:sdague/devstack-vagrant

Browse Source

Conflicts:
	puppet/modules/devstack/files/local.sh

...

This commit is contained in:

Sean Dague

2014-03-27 16:00:42 -04:00

parent 2c453a2ac9 fc8b4ca1a2

commit 18525b606f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available