tree fc631ce4ca0da2c58369028e7c6f189735dba2fc
parent ff810424930a89cfc2ce9753f0b7dc67538fd87d
parent e428a32cceeb72ebd3ef49cff77eaf4016caf6a8
author Christopher Tubbs <ctubbsii@apache.org> 1474245898 -0400
committer Christopher Tubbs <ctubbsii@apache.org> 1474245898 -0400

Merge remote-tracking branch 'origin/1.6.6-rc2' into 1.7