ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-496' into ignite-496
Date Wed, 18 Mar 2015 15:22:28 GMT
Merge remote-tracking branch 'origin/ignite-496' into ignite-496

Conflicts:
	modules/interop/src/main/cpp/ignite-interop/ignite-nodejs-prototype/include/ignite_cache.h
	modules/interop/src/main/cpp/ignite-interop/ignite-nodejs-prototype/src/ignite_cache.cpp
	modules/interop/src/main/cpp/ignite-interop/ignite-nodejs-prototype/src/main.cpp


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

Branch: refs/heads/ignite-496
Commit: c83b016058c73c498ed65281caa81f938e9f5f9c
Parents: 432cabd bfee532
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Mar 18 18:21:53 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Mar 18 18:21:53 2015 +0300

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

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



Mime
View raw message