Merge remote-tracking branch 'remotes/origin/ignite-45' into ignite-release-test-no-mod
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67addfdc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67addfdc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67addfdc Branch: refs/heads/ignite-565 Commit: 67addfdcac3109d878e430d609267fe608988a5a Parents: a4da574 6e2dbd9 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Mar 23 17:32:51 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Mar 23 17:32:51 2015 +0300 ---------------------------------------------------------------------- examples/schema-import/README.txt | 7 ++-- .../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 ++++- .../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 +- 12 files changed, 80 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
