FYI, looks like the ASF git repo @ https://gitbox.apache.org/repos/asf/hadoop.git and the github repo at https://github.com/apache/hadoop.git have lost sync;
I've merged a couple of changes in via the github UI and they aren't surfacing in the asf repo, which is still @ commit 60fa15366e8, YARN-10240. The asf internal one is the store of record, and its where changes should go until things are syncing again; we'll have to deal with the merge problems when they occur. There's a risk the resync may be lossy.
