Merge remote-tracking branch 'origin/ignite-42' into ignite-42

Conflicts:
        
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java
        
modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2be29c88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2be29c88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2be29c88

Branch: refs/heads/ignite-32
Commit: 2be29c886cf2fb583519df47752e0c655b226b5a
Parents: 25d4d8d 1fa2a90
Author: sboikov <sboi...@gridgain.com>
Authored: Wed Jan 21 18:54:10 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Wed Jan 21 18:54:10 2015 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------


Reply via email to