Revision ef13f05c
ID | ef13f05ca7a2e445bd97af538d171b14656d5999 |
Parent | 4e42b961, 651f0770 |
Child | a2c0b195 |
Merge branch 'feature-1004' into feature-992
Conflicts:
src/cloud/occi/etc/occi-server.conf
src/cloud/occi/lib/OCCIServer.rb
Files
- added
- modified
- copied
- renamed
- deleted