Merge remote-tracking branches 'remotes/origin/ignite-176' and 'remotes/origin/ignite-211' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88d24cc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88d24cc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88d24cc2 Branch: refs/heads/ignite-204 Commit: 88d24cc20266a12e9fe7faa220de12628dc427a3 Parents: 786f5ff 5772b54 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Feb 10 19:00:59 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Feb 10 19:00:59 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridProductImpl.java | 6 ++---- .../apache/ignite/lang/IgniteProductVersion.java | 12 ++++++------ .../product/GridProductVersionSelfTest.java | 16 +++++++--------- 3 files changed, 15 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
