You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/11/11 00:29:02 UTC

[14/26] incubator-usergrid git commit: Merge branch 'pr/95' into two-dot-o. This closes #95

Merge branch 'pr/95' into two-dot-o. This closes #95


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

Branch: refs/heads/es-type-updates-ryan-external
Commit: 5ade7bb2a507dfef0b0da95554f859e75e4be85d
Parents: b7f81ef bf2bd80
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Nov 7 17:56:25 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Nov 7 17:56:25 2014 -0500

----------------------------------------------------------------------
 .../index/impl/ElasticSearchResource.java       |  30 +++-
 .../usergrid/cassandra/CassandraResource.java   | 138 +++++++++++++++----
 2 files changed, 135 insertions(+), 33 deletions(-)
----------------------------------------------------------------------