You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/03/24 22:26:11 UTC
[7/9] git commit: Merge remote-tracking branch 'origin/hbase-module'
into hbase-module
Merge remote-tracking branch 'origin/hbase-module' into hbase-module
Conflicts:
hbase/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/3e23c409
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/3e23c409
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/3e23c409
Branch: refs/heads/master
Commit: 3e23c409100fc66e26ff22859425ddcdfef3f62d
Parents: 055ce27 45982c2
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Jan 28 22:23:12 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Jan 28 22:23:12 2014 +0100
----------------------------------------------------------------------
.gitignore | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------