Merge remote-tracking branch 'remotes/origin/ignite-45' into ignite-556
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1371ab49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1371ab49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1371ab49 Branch: refs/heads/ignite-556 Commit: 1371ab494ce367cf5957c610fc2381c2c383397c Parents: 36cfb49 6e2dbd9 Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 23 16:53:36 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 23 16:53:36 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/README.txt | 18 +++++++--- .../schema-import/bin/schema-import.properties | 6 ++-- .../org/apache/ignite/schema/CacheConfig.java | 38 ++++++++++++++++++++ .../ignite/schema/ConfigurationSnippet.java | 38 -------------------- .../java/org/apache/ignite/schema/Demo.java | 4 +-- .../apache/ignite/internal/IgniteKernal.java | 8 ++++- .../distributed/dht/GridDhtCacheEntry.java | 4 +-- .../ignite/internal/util/IgniteUtils.java | 17 ++++++--- .../tcp/internal/TcpDiscoveryStatistics.java | 2 +- .../internal/util/GridTestClockTimer.java | 11 ++++++ .../testframework/junits/GridAbstractTest.java | 3 ++ .../IgniteCacheFailoverTestSuite.java | 2 +- .../org/apache/ignite/schema/ui/MessageBox.java | 2 +- .../ignite/schema/ui/SchemaImportApp.java | 4 --- 14 files changed, 93 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1371ab49/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1371ab49/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ----------------------------------------------------------------------
