You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/21 16:16:28 UTC

[10/10] ignite git commit: Merge branch 'master' into ignite-1282

Merge branch 'master' into ignite-1282


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

Branch: refs/heads/ignite-1282
Commit: ff43b22cb626c066488859361692a4528d23b2ee
Parents: 8045c82 eae4df1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Sep 21 17:16:55 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Sep 21 17:16:55 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteAtomicLong.java     | 15 ++++++---------
 .../org/apache/ignite/IgniteAtomicReference.java     |  9 +++------
 .../java/org/apache/ignite/IgniteAtomicSequence.java |  9 +++------
 .../java/org/apache/ignite/IgniteAtomicStamped.java  | 13 +++++--------
 .../apache/ignite/spi/discovery/tcp/ServerImpl.java  | 12 ++++++------
 .../dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs  |  2 --
 .../config/benchmark-put-indexed-val.properties      |  2 +-
 modules/yardstick/config/ignite-base-config.xml      |  2 +-
 8 files changed, 25 insertions(+), 39 deletions(-)
----------------------------------------------------------------------