You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/12/08 22:23:51 UTC
[09/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' into index-alias
Merge branch 'two-dot-o' into index-alias
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7645a791
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7645a791
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7645a791
Branch: refs/heads/no-source-in-es
Commit: 7645a7910d3df782fe56636a6626c59f987a3bfd
Parents: e7455e9 da054a1
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 3 13:27:00 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 3 13:27:00 2014 -0700
----------------------------------------------------------------------
.../src/main/groovy/NodeRegistry.groovy | 12 +-
.../org/apache/usergrid/persistence/GeoIT.java | 579 ++++++++++---------
.../core/astyanax/BucketScopedRowKey.java | 3 +-
.../core/astyanax/CassandraConfig.java | 18 +
.../core/astyanax/ColumnNameIterator.java | 1 -
.../persistence/core/astyanax/ColumnSearch.java | 30 +-
.../persistence/core/astyanax/ColumnTypes.java | 19 +-
.../core/astyanax/FieldBufferBuilder.java | 1 -
.../astyanax/MultiKeyColumnNameIterator.java | 2 -
.../core/astyanax/MultiRowColumnIterator.java | 4 -
.../core/astyanax/MultiTennantColumnFamily.java | 1 -
.../persistence/core/astyanax/ScopedRowKey.java | 1 -
.../astyanax/StringRowCompositeSerializer.java | 35 +-
.../core/hystrix/HystrixCassandra.java | 3 -
.../core/migration/data/DataMigration.java | 31 +-
.../migration/data/DataMigrationException.java | 30 +-
.../migration/data/DataMigrationManager.java | 30 +-
.../data/DataMigrationManagerImpl.java | 3 -
.../data/MigrationInfoSerialization.java | 31 +-
.../data/MigrationInfoSerializationImpl.java | 31 +-
.../migration/schema/MigrationManagerFig.java | 18 +
.../migration/schema/MigrationManagerImpl.java | 18 +
.../core/shard/ExpandingShardLocator.java | 23 +-
.../persistence/core/shard/StringHashUtils.java | 22 +-
.../usergrid/persistence/core/task/Task.java | 19 +-
.../persistence/core/task/TaskExecutor.java | 18 +
.../simulations/PostUsersSimulation.scala | 2 +-
27 files changed, 522 insertions(+), 463 deletions(-)
----------------------------------------------------------------------