tree f4205afc26b88306b024e563b2ee13a65332dd7a
parent f8dabe53ffff02ef6693c9a2a73a754a7468ed5a
parent ed1fa87d264cff13422da2227e37ad4200038d51
author Matteo Scandolo <teo@onlab.us> 1450397705 -0800
committer Matteo Scandolo <teo@onlab.us> 1450397705 -0800

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