tree f4205afc26b88306b024e563b2ee13a65332dd7a
parent 169dc16507ddb4b8c61c3d74142b1f590b643a25
parent ff9bd800e68cc1e6dde6ad2c3a90a7313327b641
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