Merge remote-tracking branch 'remotes/origin/ignite-501' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca351282 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca351282 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca351282 Branch: refs/heads/ignite-45 Commit: ca3512823108517f68919f7d4de0f1f568ecf15a Parents: f9a85b0 944b98c Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri Mar 20 11:14:29 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri Mar 20 11:14:29 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/configuration/CacheConfiguration.java | 2 +- .../cache/GridCacheConfigurationConsistencySelfTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
