tree b2f47c219a07892050973805700f8449c26ee578
parent 150cd69a3b420ed67358fe4e39d3c20baf42f841
parent 46c13ab115510b62110d5c2c423a61342b39b7c2
author Matteo Scandolo <teo@onlab.us> 1450315832 -0800
committer Matteo Scandolo <teo@onlab.us> 1450315832 -0800

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