usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [25/50] [abbrv] git commit: Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o
Date Mon, 07 Jul 2014 18:16:42 GMT
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: 598644d6c84f155141b320b7bd7b34fa47e4df7f
Parents: 7b75a82 b0ba236
Author: Salih Kardan <kardan38@gmail.com>
Authored: Fri Jun 27 22:58:16 2014 +0300
Committer: Salih Kardan <kardan38@gmail.com>
Committed: Fri Jun 27 22:58:16 2014 +0300

----------------------------------------------------------------------
 .../corepersistence/CpRelationManager.java      |    5 +
 .../persistence/index/impl/EsProvider.java      |   56 +-
 stack/rest/pom.xml                              | 1120 +++++++++---------
 .../apache/usergrid/rest/AbstractRestIT.java    |    7 +-
 .../java/org/apache/usergrid/rest/ITSetup.java  |   15 +-
 .../apache/usergrid/rest/TomcatResource.java    |  205 +++-
 stack/test-utils/pom.xml                        |  464 ++++----
 .../java/org/apache/usergrid/TomcatMain.java    |   56 +
 .../usergrid/cassandra/CassandraResource.java   |    6 +-
 9 files changed, 1073 insertions(+), 861 deletions(-)
----------------------------------------------------------------------



Mime
View raw message