You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/09/24 01:15:19 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Conflicts:
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/963c2bf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/963c2bf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/963c2bf7

Branch: refs/heads/master
Commit: 963c2bf7e02566f4e8475b73d1314e3aa4443bd1
Parents: 8a39b8a f90e0d8
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Mon Sep 23 16:14:59 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Sep 23 16:14:59 2013 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------