Repository: hbase
Updated Branches:
refs/heads/0.94 b69f83995 -> 017bb0f6a
HBASE-12019 hbase-daemon.sh overwrite HBASE_ROOT_LOGGER and
HBASE_SECURITY_LOGGER variables (Sebastien Barrier)
Fixed conflict.
Conflicts:
bin/hbase-daemon.sh
Project: http://git-wip-us.apache.org/repos/asf/h
Repository: hbase
Updated Branches:
refs/heads/0.98 96e7058b5 -> 6267b919a
HBASE-12019 hbase-daemon.sh overwrite HBASE_ROOT_LOGGER and
HBASE_SECURITY_LOGGER variables (Sebastien Barrier)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf
Repository: hbase
Updated Branches:
refs/heads/branch-1 7c1d6b376 -> e25ca0349
HBASE-12019 hbase-daemon.sh overwrite HBASE_ROOT_LOGGER and
HBASE_SECURITY_LOGGER variables (Sebastien Barrier)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos
Repository: hbase
Updated Branches:
refs/heads/master 38dfd9c2a -> 257562036
HBASE-12019 hbase-daemon.sh overwrite HBASE_ROOT_LOGGER and
HBASE_SECURITY_LOGGER variables (Sebastien Barrier)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/a