GitHub user ptupitsyn opened a pull request:
https://github.com/apache/ignite/pull/706
IGNITE-3112 .NET: Allow merging Spring XML config with .NET config
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ptupitsyn/ignite ignite-3112
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/706.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #706
----
commit 02adbf2ebf31f16c587ee003f9093e93414d940f
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T14:43:04Z
IGNITE-3112 .NET: Allow merging Spring XML config with .NET config
commit 19c818316d6228d95064362235109638abfd9b6f
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T14:58:01Z
wip
commit 98615d06461d2c51fdfdb3d6a2622f937883c1b6
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T15:10:35Z
wip
commit 98c22d163039cabcf272090c6b9fa3cbb7a8e081
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T15:31:13Z
wip
commit 235dc1647cf5c3dd43dfd3c2cc71223f2397b334
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T15:35:58Z
Fixing tests
commit 891460fa8742482f0b658ec760dc372a07670851
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T15:48:47Z
Tests wip
commit 7f143585e7d2776e0cbb5953c5f89d19649cdfcc
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T15:59:57Z
all tests work
commit bd80f22fe012f220280bf6220274b24021f24b12
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-11T16:12:59Z
Updated docs
commit 912f5f700e5c4ca17c10abe13dd04d8957fd0b6c
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-05-12T07:34:39Z
Merge remote-tracking branch 'remotes/upstream/master' into ignite-3112
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
