Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5
Conflicts: DEVNOTES.txt Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c9cd92ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9cd92ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9cd92ef Branch: refs/heads/ignite-430 Commit: c9cd92ef29e2387e3290310a04809347808419d4 Parents: 2361640 ecc7a50 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri May 8 17:50:26 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri May 8 17:50:26 2015 +0300 ---------------------------------------------------------------------- parent/pom.xml | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------