Merge branch 'master' into bc-namespaced bc-namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 18 Jul 2016 04:58:49 +0000 (21:58 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 18 Jul 2016 04:58:49 +0000 (21:58 -0700)
commit3abcbacfa9e73bf3761c2626282afea1994f6f6c
tree3ff5404cd5c27dc0a8919f3779ce403025b9c0ab
parent4a7c2b09b80c3977ddc26274259b1c2240adc26f
parenta80817141f43d966be748c32f046bcfdfc5c4ee8
Merge branch 'master' into bc-namespaced

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