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/04/09 00:21:59 UTC
[33/43] git commit: Merge remote-tracking branch 'origin/master' into
Export_Persistance_Integration
Merge remote-tracking branch 'origin/master' into Export_Persistance_Integration
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/131c3cab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/131c3cab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/131c3cab
Branch: refs/pull/96/merge
Commit: 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593
Parents: c082e9e 778511b
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 16:10:12 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 16:10:12 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------