You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/08/27 11:13:02 UTC
[1/2] ignite git commit: ignite-1217: add suffic to comment " - Fixes
#."
Repository: ignite
Updated Branches:
refs/heads/master 6b2ee50b0 -> a2b7ba1bb
ignite-1217: add suffic to comment " - Fixes #<id>."
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cfc4d661
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cfc4d661
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cfc4d661
Branch: refs/heads/master
Commit: cfc4d6615234f3f113193f43f8fc3c6c659ef680
Parents: e4ba2eb
Author: ashutak <as...@gridgain.com>
Authored: Wed Aug 26 22:27:28 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Thu Aug 27 12:08:58 2015 +0300
----------------------------------------------------------------------
scripts/apply-pull-request.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cfc4d661/scripts/apply-pull-request.sh
----------------------------------------------------------------------
diff --git a/scripts/apply-pull-request.sh b/scripts/apply-pull-request.sh
index baa73b5..d852d78 100755
--- a/scripts/apply-pull-request.sh
+++ b/scripts/apply-pull-request.sh
@@ -128,6 +128,8 @@ if [ "${COMMENT}" == "" ]; then
COMMENT=${ORIG_COMMENT}
fi
+COMMENT="${COMMENT} - Fixes #${PR_ID}."
+
git commit --author "${AUTHOR}" -a -s -m "${COMMENT}" &> /dev/null
echo "Squash commit for pull request with id='${PR_ID}' has been added. The commit has been added with comment '${COMMENT}'."
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by nt...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a2b7ba1b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a2b7ba1b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a2b7ba1b
Branch: refs/heads/master
Commit: a2b7ba1bb70ca67d09479b9a4ca1ab4d87cced08
Parents: cfc4d66 6b2ee50
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Thu Aug 27 12:12:54 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Thu Aug 27 12:12:54 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/IgniteInternalFuture.java | 10 ++++
.../org/apache/ignite/internal/IgnitionEx.java | 23 +++++++-
.../query/GridCacheQueryFutureAdapter.java | 7 +++
.../processors/igfs/IgfsMetaManager.java | 43 +++++++--------
.../internal/processors/igfs/IgfsUtils.java | 52 ++++++++++++++++++
.../util/future/GridFinishedFuture.java | 5 ++
.../internal/util/future/GridFutureAdapter.java | 58 +++++++++++++-------
.../testframework/junits/GridAbstractTest.java | 2 +-
8 files changed, 153 insertions(+), 47 deletions(-)
----------------------------------------------------------------------