Merge remote-tracking branch 'origin/ignite-180-1' into ignite-180-1
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.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/1db85d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1db85d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1db85d05
Branch: refs/heads/ignite-537
Commit: 1db85d05df790c233c4b11b5c4e0c916beaa195f
Parents: 0c9c60c 1a4e7f1
Author: sboikov <[email protected]>
Authored: Tue Apr 7 12:53:41 2015 +0300
Committer: sboikov <[email protected]>
Committed: Tue Apr 7 12:53:41 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
