Xiaoyu Yao 570b503e3e Fix merge conflicts

2019-01-15 22:54:50 -07:00

..

hadoop-annotations

…

hadoop-auth

HDDS-6. Enable SCM kerberos auth. Contributed by Ajay Kumar.

2019-01-15 22:16:58 -07:00

hadoop-auth-examples

…

hadoop-common

Fix merge conflicts

2019-01-15 22:54:50 -07:00

hadoop-kms

HADOOP-15922. Revert patch 004.

2018-11-30 12:49:46 -05:00

hadoop-minikdc

…

hadoop-nfs

…

hadoop-registry

HADOOP-16031. Fixed TestSecureLogins unit test. Contributed by Akira Ajisaka

2019-01-07 13:21:14 -05:00

pom.xml

…