You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/20 19:21:29 UTC
[23/38] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into binary_serialization
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization
# By Dave Johnson
# Via Dave Johnson (1) and Todd Nine (1)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
Fixing merge error: duplicate module in POM.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/96ca52ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/96ca52ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/96ca52ed
Branch: refs/pull/77/merge
Commit: 96ca52ed10738c879b9f6939f75b6a89d75385cd
Parents: 4111f15 070f15b
Author: grey <gr...@apigee.com>
Authored: Tue Mar 18 09:23:42 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 18 09:23:42 2014 -0700
----------------------------------------------------------------------
stack/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/96ca52ed/stack/pom.xml
----------------------------------------------------------------------