Merge remote-tracking branch 'remotes/origin/master' 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/4ae73f0b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ae73f0b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ae73f0b Branch: refs/heads/ignite-1537 Commit: 4ae73f0b611630d6192ef643ab34af86d113f365 Parents: 8edd9dd 303def3 Author: sboikov <[email protected]> Authored: Thu Oct 29 09:26:32 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Oct 29 09:26:32 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 69 ++++++++++---------- .../fair/FairAffinityDynamicCacheSelfTest.java | 2 + .../GridDiscoveryManagerAttributesSelfTest.java | 23 ++++--- .../CacheSerializableTransactionsTest.java | 2 + .../cache/CrossCacheTxRandomOperationsTest.java | 2 + modules/jms11/pom.xml | 7 -- .../stream/jms11/IgniteJmsStreamerTest.java | 9 ++- 7 files changed, 63 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
