tree eafd3afe7bf2c87d1c9905ec279c706779f9cf4e
parent 735fd46d92dc5a089e9a5a4f5714fbc33eab49ad
parent 17b73f6e3cf883856747a0bd1224251e707c4414
author Christopher Tubbs <ctubbsii@apache.org> 1474245918 -0400
committer Christopher Tubbs <ctubbsii@apache.org> 1474245918 -0400

Merge branch '1.7' into 1.8