You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/21 18:08:18 UTC

[2/5] ignite git commit: Merge remote-tracking branch 'origin/ignite-1537' into ignite-1537

Merge remote-tracking branch 'origin/ignite-1537' into ignite-1537


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

Branch: refs/heads/ignite-1537
Commit: 6ce7fdfcdff247f878a46007d972ee85229ad35a
Parents: a325e0e 37303d2
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 1 18:29:12 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 1 18:29:12 2015 +0300

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |  2 ++
 examples/pom.xml                                |  2 +-
 examples/schema-import/pom.xml                  |  2 +-
 modules/aop/pom.xml                             |  2 +-
 modules/apache-license-gen/pom.xml              |  2 +-
 modules/aws/pom.xml                             |  2 +-
 modules/camel/pom.xml                           |  2 +-
 modules/clients/pom.xml                         |  2 +-
 modules/cloud/pom.xml                           |  2 +-
 modules/codegen/pom.xml                         |  2 +-
 modules/core/pom.xml                            |  2 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java    | 19 ++++++++---
 .../GridCacheDefaultAffinityKeyMapper.java      |  9 ++++-
 .../dht/preloader/GridDhtPartitionDemander.java | 19 ++++++-----
 .../near/GridNearOptimisticTxPrepareFuture.java | 10 ++----
 .../CacheObjectBinaryProcessorImpl.java         |  7 +++-
 .../communication/tcp/TcpCommunicationSpi.java  | 10 +++---
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../CachePutEventListenerErrorSelfTest.java     | 35 +++++++++++---------
 .../cache/GridCacheClearSelfTest.java           |  9 +++--
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |  9 +++--
 .../cache/IgniteCacheAbstractTest.java          |  3 ++
 .../IgnitePortableCacheTestSuite.java           |  1 -
 modules/extdata/p2p/pom.xml                     |  2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |  2 +-
 modules/extdata/uri/pom.xml                     |  2 +-
 modules/flume/pom.xml                           |  2 +-
 modules/gce/pom.xml                             |  2 +-
 modules/geospatial/pom.xml                      |  2 +-
 modules/hadoop/pom.xml                          |  2 +-
 modules/hibernate/pom.xml                       |  2 +-
 modules/indexing/pom.xml                        |  2 +-
 modules/jcl/pom.xml                             |  2 +-
 modules/jms11/pom.xml                           |  2 +-
 modules/jta/pom.xml                             |  2 +-
 modules/kafka/pom.xml                           |  2 +-
 modules/log4j/pom.xml                           |  2 +-
 modules/log4j2/pom.xml                          |  2 +-
 modules/mesos/pom.xml                           |  2 +-
 modules/mqtt/pom.xml                            |  2 +-
 modules/rest-http/pom.xml                       |  2 +-
 modules/scalar-2.10/pom.xml                     |  2 +-
 modules/scalar/pom.xml                          |  2 +-
 modules/schedule/pom.xml                        |  2 +-
 modules/schema-import/pom.xml                   |  2 +-
 modules/slf4j/pom.xml                           |  2 +-
 modules/spark-2.10/pom.xml                      |  2 +-
 modules/spark/pom.xml                           |  2 +-
 modules/spring/pom.xml                          |  2 +-
 modules/ssh/pom.xml                             |  2 +-
 modules/tools/pom.xml                           |  2 +-
 modules/twitter/pom.xml                         |  2 +-
 modules/urideploy/pom.xml                       |  2 +-
 modules/visor-console-2.10/pom.xml              |  2 +-
 modules/visor-console/pom.xml                   |  2 +-
 modules/visor-plugins/pom.xml                   |  2 +-
 modules/web/pom.xml                             |  2 +-
 modules/yardstick/pom.xml                       |  2 +-
 modules/yarn/pom.xml                            |  2 +-
 modules/zookeeper/pom.xml                       |  2 +-
 pom.xml                                         |  2 +-
 61 files changed, 135 insertions(+), 96 deletions(-)
----------------------------------------------------------------------