Merge branch 'master' of https://github.com/Aghoreyshi/python-barbicanclient

Browse Source

Conflicts:
	barbicanclient/client.py

...

This commit is contained in:

Arash Ghoreyshi

2013-06-21 13:41:47 -05:00

parent a496993c4f 3bfa9170fc

commit e5155bd7ba

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