Merge branch 'master' into namespaced namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 18 Jul 2016 04:58:23 +0000 (21:58 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 18 Jul 2016 04:58:23 +0000 (21:58 -0700)
commit58bf68e494ef837a62d261695adde074d62ac116
tree8168651c84c330e75a70387b0249d856ef726ec8
parenta88359c3b96f00834e517fe79a085c786cdd8e4a
parenta80817141f43d966be748c32f046bcfdfc5c4ee8
Merge branch 'master' into namespaced

* master:
  swc-installation-test-2.py: Prefer distro to platform.linux_distribution
setup/installation-test/swc-installation-test-2.py