Merge branch 'ignite-sprint-4' into ignite-728
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/65780ec5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/65780ec5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/65780ec5 Branch: refs/heads/ignite-157-2 Commit: 65780ec532bcae5e45946aef70b210e3ca6e26a8 Parents: 35e90b8 ee5bae9 Author: agura <ag...@gridgain.com> Authored: Thu Apr 30 12:23:55 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Thu Apr 30 12:23:55 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- .../configuration/CacheConfiguration.java | 255 +++++++++++--- .../configuration/IgniteConfiguration.java | 344 +++++++++++++++---- .../ignite/internal/GridUpdateNotifier.java | 66 +++- .../apache/ignite/internal/IgniteKernal.java | 83 +++-- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../managers/communication/GridIoManager.java | 8 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 +- .../internal/GridUpdateNotifierSelfTest.java | 13 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 154 +++++++++ ...GridCacheLoadingConcurrentGridStartTest.java | 154 --------- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- 12 files changed, 762 insertions(+), 353 deletions(-) ----------------------------------------------------------------------