usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [22/22] incubator-usergrid git commit: Merge branch 'two-dot-o' into index-alias
Date Wed, 03 Dec 2014 22:29:29 GMT
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/two-dot-o
Commit: 7645a7910d3df782fe56636a6626c59f987a3bfd
Parents: e7455e9 da054a1
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Dec 3 13:27:00 2014 -0700
Committer: Shawn Feldman <sfeldman@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(-)
----------------------------------------------------------------------



Mime
View raw message