helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Fri, 15 Feb 2013 22:20:13 GMT
Updated Branches:
  refs/heads/master 76aa2b660 -> 92a446068


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/92a44606
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/92a44606
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/92a44606

Branch: refs/heads/master
Commit: 92a446068bd234714c585a959ab5375c66cfd3a5
Parents: 5e8a912 76aa2b6
Author: slu2011 <lushi04@gmail.com>
Authored: Fri Feb 15 14:19:39 2013 -0800
Committer: slu2011 <lushi04@gmail.com>
Committed: Fri Feb 15 14:19:39 2013 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/helix/PropertyKey.java    |    6 ++
 .../controller/stages/TaskAssignmentStage.java     |    4 ++
 .../helix/manager/zk/ZkCacheBaseDataAccessor.java  |    2 +
 .../TestAddStateModelFactoryAfterConnect.java      |   40 ++++++---------
 .../integration/TestZkCallbackHandlerLeak.java     |   25 +++++++--
 .../helix/manager/zk/TestZkClusterManager.java     |    4 +-
 .../helix/store/zk/TestZkHelixPropertyStore.java   |   21 ++++++++
 7 files changed, 70 insertions(+), 32 deletions(-)
----------------------------------------------------------------------



Mime
View raw message