You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/02/27 13:52:44 UTC
[1/2] tinkerpop git commit: Updated branching strategy now that tp33
is present CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 614c346d6 -> 69a355f85
Updated branching strategy now that tp33 is present CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a857da8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a857da8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a857da8
Branch: refs/heads/tp33
Commit: 1a857da8a09bb5289296493f21ba89b581e77882
Parents: 072f112
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 27 08:51:18 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 27 08:51:18 2018 -0500
----------------------------------------------------------------------
docs/src/dev/developer/for-committers.asciidoc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a857da8/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index b44de9a..c8b5559 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -65,10 +65,11 @@ TinkerPop has several release branches:
* `tp30` - 3.0.x (no longer maintained)
* `tp31` - 3.1.x (no longer maintained)
* `tp32` - 3.2.x (bug fixes and documentation updates only)
-* `master` - 3.3.x
+* `tp33` - 3.3.x (current development)
+* `master` - 3.4.x (future development)
-Changes to `tp32` should merge to `master`. Please read more about this process in the <<pull-requests, Pull Requests>>
-section.
+Changes to `tp32` should merge to `tp33` and then `tp33` to `master`. Please read more about this process in the
+<<pull-requests, Pull Requests>> section.
Other branches may be created for collaborating on features or for RFC's that other developers may want to inspect.
It is suggested that the JIRA issue ID be used as the prefix, since that triggers certain automation, and it provides a
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
docs/src/dev/developer/for-committers.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/69a355f8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/69a355f8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/69a355f8
Branch: refs/heads/tp33
Commit: 69a355f85cda60dd3c2fbaeb4b0608506d3945d8
Parents: 614c346 1a857da
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 27 08:52:16 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 27 08:52:16 2018 -0500
----------------------------------------------------------------------
docs/src/dev/developer/for-committers.asciidoc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69a355f8/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------