Merge branches 'ignite-41' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-41
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/570563a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/570563a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/570563a0 Branch: refs/heads/ignite-41 Commit: 570563a0753fc2fdf2624b65e0c0a5e524ce60aa Parents: eac503e 1812040 Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 19 16:12:28 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 19 16:12:28 2014 +0300 ---------------------------------------------------------------------- ipc/shmem/ggshmem/Makefile.am | 2 +- ipc/shmem/ggshmem/Makefile.in | 2 +- .../java/META-INF/native/linux32/libggshmem.so | Bin 136714 -> 0 bytes .../java/META-INF/native/linux64/libggshmem.so | Bin 145904 -> 138023 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 29312 -> 32940 bytes 5 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
