usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [6/9] git commit: Merge remote-tracking branch 'amuramoto/2.0' into tempmerge
Date Thu, 02 Oct 2014 07:31:51 GMT
Merge remote-tracking branch 'amuramoto/2.0' into tempmerge


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

Branch: refs/heads/esbatching
Commit: 93471f78dfb0276909833dda2015fba93b56375f
Parents: c051fda d1dc7cd
Author: Todd Nine <toddnine@apache.org>
Authored: Wed Oct 1 23:47:57 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Wed Oct 1 23:47:57 2014 -0600

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |   9 +-
 .../usergrid/persistence/CollectionIT.java      |   3 -
 .../usergrid/persistence/index/query/Query.java |   2 +-
 .../index/query/tree/AndOperand.java            |   2 +-
 .../persistence/index/query/tree/Property.java  |   2 +-
 .../index/query/tree/StringLiteral.java         |   2 +-
 .../apache/usergrid/rest/PartialUpdateTest.java | 120 ++++++++++---------
 7 files changed, 75 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93471f78/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------


Mime
View raw message