Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebdc21d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebdc21d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebdc21d9 Branch: refs/heads/ignite-843-rc1 Commit: ebdc21d9fe978e38fe0e409bc3fe1d5fdb9c64a7 Parents: 12d5b16 04964b9 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Fri Oct 30 17:43:10 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Fri Oct 30 17:43:10 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 69 ++++++++++---------- .../internal/portable/PortableWriterExImpl.java | 66 ++++++++++--------- .../processors/cache/GridCacheIoManager.java | 28 +++++++- .../fair/FairAffinityDynamicCacheSelfTest.java | 2 + .../GridDiscoveryManagerAttributesSelfTest.java | 23 ++++--- .../cache/CacheNearReaderUpdateTest.java | 2 + .../CacheSerializableTransactionsTest.java | 2 + .../cache/CrossCacheTxRandomOperationsTest.java | 2 + .../cache/IgniteCacheCreateRestartSelfTest.java | 6 +- .../cache/IgniteCachePutAllRestartTest.java | 3 + .../IgniteCountDownLatchAbstractSelfTest.java | 4 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 5 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 7 +- ...omicNearEnabledMultiNodeFullApiSelfTest.java | 7 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 32 ++++++++- modules/jms11/pom.xml | 9 +-- .../stream/jms11/IgniteJmsStreamerTest.java | 9 ++- 17 files changed, 183 insertions(+), 93 deletions(-) ----------------------------------------------------------------------
