tree 8b0b6fd701d1db5f6f1d3703c3e39a122e658892
parent 76b4e985b9e05ae90a57aa5102e43c3b68584f56
parent 5e505a56d459cf0095cd91cfda0e15f639d9d1cb
author Matteo Scandolo <teo@onlab.us> 1450121276 -0800
committer Matteo Scandolo <teo@onlab.us> 1450121276 -0800

Merge branch 'master' of github.com:open-cloud/xos into feature/ceilometerDashboard