ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [9/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-2542
Date Mon, 08 Feb 2016 17:07:38 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-2542


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

Branch: refs/heads/ignite-2542
Commit: 52e7d9de6d4362e821ed4430daa8c2c7422161c5
Parents: e5763b8 fa246cd
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Feb 8 20:06:53 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Feb 8 20:06:53 2016 +0300

----------------------------------------------------------------------
 .gitignore                                      |   3 +
 .../ignite/binary/BinaryBasicNameMapper.java    |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  33 ++--
 ...arOptimisticSerializableTxPrepareFuture.java |   4 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   2 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |  66 ++++----
 .../GridCacheReplicatedPreloadSelfTest.java     | 120 +++++++++-----
 .../Binary/BinarySelfTest.cs                    |  32 ++++
 .../Query/CacheQueriesCodeConfigurationTest.cs  |   4 +-
 .../Cache/Configuration/QueryEntity.cs          |   4 +-
 .../Multicast/TcpDiscoveryMulticastIpFinder.cs  |   4 +-
 .../Tcp/Static/TcpDiscoveryStaticIpFinder.cs    |   6 +-
 .../Impl/Binary/BinaryUtils.cs                  | 166 ++++++++++++++++---
 modules/yardstick/.gitignore                    |   2 +
 parent/pom.xml                                  |  92 +++++++++-
 16 files changed, 418 insertions(+), 124 deletions(-)
----------------------------------------------------------------------



Mime
View raw message