tree dd8523636e08f261318274e1f80e1cbdfdbe4e7e
parent 3aecf0ac8b3b9d3b5b2b6a1ef44e18ce55c56317
parent d5ea00fcd5b3ec574181d4dea70088653943c9fe
author Sean Busbey <busbey@cloudera.com> 1466198278 -0500
committer Sean Busbey <busbey@cloudera.com> 1466198278 -0500

Merge branch '1.6' into 1.7

 Conflicts:
	LICENSE