Merge branch 'master' into 11821-discovery-doc-updates
authorradhika <radhika@curoverse.com>
Fri, 9 Jun 2017 22:37:11 +0000 (18:37 -0400)
committerradhika <radhika@curoverse.com>
Fri, 9 Jun 2017 22:37:11 +0000 (18:37 -0400)
commit82c90381c1ebdab5be7870b13ca8898e81b042c8
treec275df161c5e382713e5650eeb3a2d176ca30091
parent3c007c51881e1f89b6a7db3af1a09ecfa96f2631
parentd66b42e150030edff5ddb211d76d03d4bcd572ec
Merge branch 'master' into 11821-discovery-doc-updates