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/03 01:22:18 UTC

[37/44] git commit: merging upstream

merging upstream


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9011d58a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9011d58a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9011d58a

Branch: refs/pull/92/head
Commit: 9011d58a8e57098606814a84af2ad1ce4c0dc1ea
Parents: 6710809
Author: amuramoto <am...@apigee.com>
Authored: Wed Apr 2 09:28:33 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Apr 2 09:28:33 2014 -0700

----------------------------------------------------------------------
 .../js/libs/usergrid-libs.min.js.orig           | 26 ++++++++++++++++++++
 .../js/usergrid-coverage.min.js.BACKUP.31213.js |  6 +++++
 .../js/usergrid-coverage.min.js.BASE.31213.js   |  6 +++++
 .../js/usergrid-coverage.min.js.LOCAL.31213.js  |  6 +++++
 .../js/usergrid-coverage.min.js.REMOTE.31213.js |  0
 5 files changed, 44 insertions(+)
----------------------------------------------------------------------