Merge remote-tracking branch 'docker/release' into bump-1.6.1

This commit is contained in:
Daniel Nephin 2016-02-23 11:15:34 -08:00
commit 722e3a2fc7

Diff Content Not Available