Merge commit 'refs/pull/356/head' of github.com:apache/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7f2268d5 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7f2268d5 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7f2268d5 Branch: refs/heads/two-dot-o-dev Commit: 7f2268d5b6d1b40715facafb27f7f81f28aedd96 Parents: a11aaa0 33dd4d3 Author: Todd Nine <[email protected]> Authored: Thu Aug 27 16:16:35 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Thu Aug 27 16:16:35 2015 -0600 ---------------------------------------------------------------------- .../src/main/groovy/configure_usergrid.groovy | 2 - .../main/resources/usergrid-default.properties | 55 +++++++++++--------- .../src/test/resources/usergrid-test.properties | 4 +- .../corepersistence/index/CoreIndexFig.java | 13 ++++- .../main/resources/usergrid-core-context.xml | 6 +-- .../resources/usergrid-custom-test.properties | 4 +- .../serialization/SerializationFig.java | 2 +- .../persistence/core/astyanax/CassandraFig.java | 2 +- .../usergrid/persistence/index/IndexFig.java | 13 +++-- .../src/test/resources/usergrid-UNIT.properties | 3 +- .../usergrid/persistence/queue/QueueFig.java | 4 -- .../resources/usergrid-standalone.properties | 2 - .../resources/usergrid-custom-test.properties | 1 - .../management/AccountCreationProps.java | 2 - .../resources/usergrid-custom-test.properties | 1 - 15 files changed, 63 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
