usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [42/44] git commit: Merge remote-tracking branch 'origin/master' into Export_Persistance_Integration
Date Wed, 02 Apr 2014 23:22:23 GMT
Merge remote-tracking branch 'origin/master' into Export_Persistance_Integration


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

Branch: refs/pull/92/head
Commit: 243856367f0a62ba435891852ea63cfd189ab2e3
Parents: cb76cca 1b4038a
Author: grey <greyes@apigee.com>
Authored: Wed Apr 2 16:04:30 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Wed Apr 2 16:04:30 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |    8 +-
 portal/Gruntfile.js                             |    5 +-
 portal/README.md                                |   10 +-
 portal/config.js                                |   15 -
 portal/dist/rel-usergrid-portal.2.0.3.zip       |  Bin 0 -> 16313787 bytes
 portal/dist/usergrid-portal/config.js           |   15 -
 portal/dist/usergrid-portal/index-debug.html    |   16 +
 portal/dist/usergrid-portal/index-template.html |   16 +
 portal/dist/usergrid-portal/index.html          |   16 +
 .../js/libs/usergrid-libs.min.js                |    2 +-
 .../js/libs/usergrid-libs.min.js.orig           |   26 +
 .../dist/usergrid-portal/js/usergrid-dev.min.js |    4 +-
 portal/dist/usergrid-portal/js/usergrid.min.js  |    4 +-
 portal/index-debug.html                         |   16 +
 portal/index-template.html                      |   16 +
 portal/index.html                               |   16 +
 portal/js/global/help-service.js                |    2 +-
 portal/js/libs/usergrid-libs.min.js             |   22 -
 portal/js/usergrid-dev.min.js                   | 4939 ------------------
 portal/js/usergrid-dev.min.js.orig              | 4939 ++++++++++++++++++
 portal/js/usergrid.min.js                       |    6 -
 portal/js/usergrid.min.js.orig                  |    6 +
 .../instrument/js/usergrid-coverage.min.js      |    6 -
 .../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
 .../test/coverage/instrument/js/usergrid.min.js |    3 -
 28 files changed, 5107 insertions(+), 5019 deletions(-)
----------------------------------------------------------------------



Mime
View raw message