tree 8a9bbab3c31c7322a32df98fdea25ec88a29f854
parent 43218d2d604c2ae815718814a68ad90f522cc338
parent 8a24bc97bfb124354670a86fd3c161234d6a812d
author Matteo Scandolo <teo@onlab.us> 1450391674 -0800
committer Matteo Scandolo <teo@onlab.us> 1450391674 -0800

Merge branch 'xos_auto_scaling_app_changes' of github.com:open-cloud/xos into xos_auto_scaling_app_changes