tree 8a9bbab3c31c7322a32df98fdea25ec88a29f854
parent 7564bcbf9f6a0c70a4bef5947a97cbc876883f80
parent a1ef693185f24655eddee429b29776e06acee249
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