hbase git commit: HBASE-20260 Conflict with new upgrade guide ADDENDUM

2018-03-27 Thread mdrob
Repository: hbase Updated Branches: refs/heads/branch-2 f4fe0521a -> 78452113c HBASE-20260 Conflict with new upgrade guide ADDENDUM Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/78452113 Tree: http://git-wip-us.apache.or

hbase git commit: HBASE-20260 Conflict with new upgrade guide ADDENDUM

2018-03-27 Thread mdrob
Repository: hbase Updated Branches: refs/heads/master f7eefaa12 -> 3b6199a27 HBASE-20260 Conflict with new upgrade guide ADDENDUM Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3b6199a2 Tree: http://git-wip-us.apache.org/