Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e05aa52 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e05aa52 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e05aa52 Branch: refs/heads/ignite-1093-3 Commit: 0e05aa5241132a738d92dbf596b04c68ec779448 Parents: e2f2ee4 303def3 Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 29 10:50:17 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 29 10:50:17 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 | 9 +-- .../stream/jms11/IgniteJmsStreamerTest.java | 9 ++- 7 files changed, 64 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0e05aa52/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
