tree eaee9f47d7671e847fd2830e8d4544541406afdf
parent 982bd8768891d8bf78682c71d4c8b12ccddbcab2
parent 6c6b928b725ada5d9754cc8b2b4fc10de0a112f1
author Matteo Scandolo <teo@onlab.us> 1450219105 -0800
committer Matteo Scandolo <teo@onlab.us> 1450219105 -0800

Merge branch 'feature/ceilometerDashboard'