10343: Merge branch 'master' into 10343-dockercleaner-config
authorTom Clegg <tom@curoverse.com>
Mon, 31 Oct 2016 20:08:01 +0000 (16:08 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 31 Oct 2016 20:08:01 +0000 (16:08 -0400)
commit9e2e220996943f6de9a059a6b57c458f60f10e8e
tree10ed947927b41ce8d6356f11caf8b5ddf8365b43
parentb13ad9d7173ac5dff945d4a2ec572510ff0fd5da
parent69abf05f9257431a2084897dd3e7f1a4b76ae462
10343: Merge branch 'master' into 10343-dockercleaner-config