Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ae249e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ae249e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ae249e1 Branch: refs/heads/ignite-424 Commit: 0ae249e11b9e1909199c0ef927036606d9638833 Parents: 366b332 19bd611 Author: Andrey <anovi...@gridgain.com> Authored: Tue Apr 28 15:38:24 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Apr 28 15:38:24 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridJobContextImpl.java | 7 +++---- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 10 ++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
