Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4b908cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4b908cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4b908cf Branch: refs/heads/ignite-32 Commit: f4b908cff63bed82969b542775c60df03ecfdcb9 Parents: ac306c5 47cf475 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Dec 19 17:55:50 2014 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Dec 19 17:55:50 2014 +0700 ---------------------------------------------------------------------- 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 -> 161925 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 29312 -> 32940 bytes 5 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
