add aqmp gem
default dummy
Merge remote-tracking branch 'upstream/master'
Added Gemnasium status
add amqp
Merge remote-tracking branch 'upstream/master'
default dummy
Add new amqp frontend and rearrange the http frontend for not so much double code - also add an inital bin/occi_server script (is still being implemented)
add comments for better code reading
typo fix (lower case)
add trim_mode to text/plain erb rendering to prevent parser warnings in rocci-client
add trim_mode to text/plain erb rendering to prevent parser warnings in rocci-client
Merge branch 'amqp' of https://github.com/msrba/rOCCI-server into amqp
delete wrong files
fix a problem with erb and linebreaks
Merge pull request #26 from msrba/amqp

Add amqp frontend and rearrange http frontend
standard server must be http
Small ON backend bug fixes

* Removed trailing slash in ON backend configuration
* Fixed ON template handling, users don't need to own
  or have manage rights on the templates to instantiate
  them
Merge pull request #29 from arax/master

ON backend fixes
Update etc/configuration.yml