Merge remote-tracking branch 'origin/master'

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19c7f388
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19c7f388
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19c7f388

Branch: refs/heads/master
Commit: 19c7f3882fbcbbaaae718ea17711443f386c0436
Parents: 9f4bd20 5281a0f
Author: Anton Vinogradov <a...@apache.org>
Authored: Mon Sep 19 18:40:47 2016 +0300
Committer: Anton Vinogradov <a...@apache.org>
Committed: Mon Sep 19 18:40:47 2016 +0300

----------------------------------------------------------------------
 .../store/cassandra/CassandraCacheStore.java    |   2 +-
 .../cassandra/CassandraCacheStoreFactory.java   |   2 +-
 .../store/cassandra/common/CassandraHelper.java |  18 +
 .../cassandra/common/PropertyMappingHelper.java |   3 +-
 .../persistence/KeyPersistenceSettings.java     |  55 ++-
 .../KeyValuePersistenceSettings.java            |  82 +++-
 .../persistence/PersistenceController.java      | 417 ++++++++++---------
 .../persistence/PersistenceSettings.java        | 157 ++++++-
 .../store/cassandra/persistence/PojoField.java  |  47 ++-
 .../persistence/ValuePersistenceSettings.java   |  21 +-
 .../ignite/tests/IgnitePersistentStoreTest.java |  14 +-
 .../ignite/tests/load/PersonGenerator.java      |   2 +-
 .../org/apache/ignite/tests/pojos/Person.java   |  35 +-
 .../apache/ignite/tests/utils/TestsHelper.java  |  22 +-
 .../persistence/pojo/persistence-settings-3.xml |   2 +
 15 files changed, 602 insertions(+), 277 deletions(-)
----------------------------------------------------------------------


Reply via email to