Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/ebd37fed Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/ebd37fed Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/ebd37fed Branch: refs/heads/master Commit: ebd37fed4b6d1631525e96c6d7301096f4505c58 Parents: f8e3b1a ea8c61d Author: zzhang <[email protected]> Authored: Mon Nov 11 13:09:35 2013 -0800 Committer: zzhang <[email protected]> Committed: Mon Nov 11 13:09:35 2013 -0800 ---------------------------------------------------------------------- helix-admin-webapp/pom.xml | 5 ----- pom.xml | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
