tree b2f47c219a07892050973805700f8449c26ee578
parent 53cab1b6195f068c697846621b035a1e9271c3a0
parent 3aa413d5957c9c7152c85c87196c341cd9150803
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