tree fa32b5398c8fed73b938a60fc3d1170ec2d2d611
parent d15d3bbd46cce77e3b5ca67bbadcf7106a7b66d3
parent 07c52f31b0d473111f0d9bfee2f2be12ebdfa4a1
author Matteo Scandolo <teo@onlab.us> 1454975070 -0800
committer Matteo Scandolo <teo@onlab.us> 1454975070 -0800

Merge branch 'master' into feature/serviceTopology

# Conflicts:
#	views/ngXosViews/ceilometerDashboard/src/js/main.js