You are viewing a plain text version of this content. The canonical link for it is here.

Posted to s4-commits@incubator.apache.org by df...@apache.org on 2013/03/13 13:52:21 UTC

[2/2] git commit: Merge branch 'S4-129' into dev

Updated Branches:
  refs/heads/dev 632057fd3 -> 6fd8f1dc0


Merge branch 'S4-129' into dev


Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/6fd8f1dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/6fd8f1dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/6fd8f1dc

Branch: refs/heads/dev
Commit: 6fd8f1dc0f37f3ed91dcb99db9fac219cb70c747
Parents: 632057f 1cd3c5d
Author: Daniel Gómez Ferro <df...@apache.org>
Authored: Wed Mar 13 13:44:10 2013 +0100
Committer: Daniel Gómez Ferro <df...@apache.org>
Committed: Wed Mar 13 13:44:10 2013 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/s4/core/S4Node.java   |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------