tree e55228843ad88bd8fad6e86bdd4f3a2fd18e27a0
parent 06dd5933c406d8af773a0d054d0ff1afb8cfe589
parent 4e1b3b3a5b0207e9be529c09a44f558c40ca115b
author Michael Jumper <mjumper@apache.org> 1531974441 -0700
committer Michael Jumper <mjumper@apache.org> 1531974441 -0700

Merge 1.0.0 changes back to master.