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 2015/08/10 12:53:05 UTC
[1/6] incubator-tinkerpop git commit: Add "For Committers"
documentation
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp30 ad6652435 -> dec75e5c3
Add "For Committers" documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2be03c0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2be03c0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2be03c0a
Branch: refs/heads/tp30
Commit: 2be03c0acb0bb0b0b94c01f310461cd3366ea56a
Parents: 58b699e
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Fri Jul 31 07:48:44 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Fri Jul 31 07:49:28 2015 -0700
----------------------------------------------------------------------
CONTRIBUTING.asciidoc | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2be03c0a/CONTRIBUTING.asciidoc
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc
index 705a90a..d27a62c 100644
--- a/CONTRIBUTING.asciidoc
+++ b/CONTRIBUTING.asciidoc
@@ -20,3 +20,45 @@ Contributions via GitHub pull requests are gladly accepted from their original
author. By submitting any copyrighted material via pull request, email, or other means
you agree to license the material under the project's open source license and
warrant that you have the legal authority to do so.
+
+## For Committers
+
+For those with commit access to the main repository, here are a few guidelines.
+
+### Release Notes
+
+We use a two-pronged approach to maintaining the change log and preparing the release notes.
+
+1. For work that is documented in JIRA, we can run reports that include all of
+the tickets targeted for a specific release. This report can be included in the
+release announcement.
+
+2. The manual change log (CHANGELOG.asciidoc) can be used to highlight large
+changes, describe themes (e.g. "We focused on performance improvements") or to
+give voice to undocumented changes.
+
+### Branches
+
+We maintain the "master" branch as the one where most people would be developing.
+
+Additionally, we may have release branches for maintenance work. For example,
+the "tp30" branch is used to maintain the 3.0.x line while work on 3.1.x
+proceeds on "master".
+
+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
+way to account for the branch lifecycle, i.e. "Who's branch is this, and can I
+delete it?" For example, TINKERPOP3-999-add-cool-new-feature is a nice branch
+name.
+
+For branches that are NOT associated with JIRA issues, you are free to use your
+Apache ID as a branch name prefix. This provides a unique namespace, and also a
+way to account for the branch lifecycle.
+
+Please remove your own branches when they are no longer needed.
+
+### Tags
+
+We use tags for milestones, release candidates, and approved releases. Please
+refrain from creating arbitrary tags, as they produce permanent clutter.
[3/6] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30' into tp30
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30' into tp30
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b0bf744a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b0bf744a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b0bf744a
Branch: refs/heads/tp30
Commit: b0bf744aafb88c36e16436645cc2d7d1301d8c01
Parents: 3c6df3c ad66524
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 10 06:35:46 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 10 06:35:46 2015 -0400
----------------------------------------------------------------------
.../step/filter/TraversalFilterStep.java | 7 ++++
.../step/map/TraversalFlatMapStep.java | 2 +-
.../traversal/step/map/TraversalMapStep.java | 2 +-
.../sideEffect/TraversalSideEffectStep.java | 7 ++++
.../IncidentToAdjacentStrategy.java | 4 +-
.../IncidentToAdjacentStrategyTest.java | 3 +-
.../step/sideEffect/GroovyGroupCountTest.groovy | 7 +++-
.../step/sideEffect/GroupCountTest.java | 41 ++++++++++++++++++--
.../tinkerpop/gremlin/structure/EdgeTest.java | 1 +
9 files changed, 66 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[6/6] incubator-tinkerpop git commit: Mention the breaking label for
jira in release notes.
Posted by sp...@apache.org.
Mention the breaking label for jira in release notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/dec75e5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dec75e5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dec75e5c
Branch: refs/heads/tp30
Commit: dec75e5c36640530d4440851d7fcd2d6bdd58437
Parents: 005c0e5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 10 06:52:41 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 10 06:52:41 2015 -0400
----------------------------------------------------------------------
README.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dec75e5c/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index 86b7f33..7f1b6e7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -98,7 +98,7 @@ TinkerPop3 uses Apache JIRA as its link:https://issues.apache.org/jira/browse/TI
** A `bug` has a very specific meaning, referring to an error that prevents usage of TinkerPop AND does not have a reasonable workaround. Given that definition, a `bug` should generally have very high priority for a fix.
** Everything else is an `improvement` in the sense that any other work is an enhancement to the current codebase.
* The "component" should be representative of the primary area of code that it applies to and all issues should have this property set.
-* Issues are not assigned "labels".
+* Issues are not assigned "labels" with one exception: the "breaking" label. The "breaking" label marks an issue as one that is representative of a change in the API that might affect users or vendors. This label is important when organizing release notes.
* The "affects/fix version(s)" fields should be appropriately set, where the "fix version" implies the version on which that particular issue will completed.
Release Process
[5/6] incubator-tinkerpop git commit: Some adjustments to
"contributing".
Posted by sp...@apache.org.
Some adjustments to "contributing".
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/005c0e5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/005c0e5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/005c0e5f
Branch: refs/heads/tp30
Commit: 005c0e5f8051da3fa3a95ed8dc17527dc09a35af
Parents: 21b1ef7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 10 06:51:01 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 10 06:51:01 2015 -0400
----------------------------------------------------------------------
CONTRIBUTING.asciidoc | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/005c0e5f/CONTRIBUTING.asciidoc
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc
index d27a62c..0663f93 100644
--- a/CONTRIBUTING.asciidoc
+++ b/CONTRIBUTING.asciidoc
@@ -23,42 +23,47 @@ warrant that you have the legal authority to do so.
## For Committers
-For those with commit access to the main repository, here are a few guidelines.
+The guidelines that follow apply to those with commit access to the main repository:
### Release Notes
-We use a two-pronged approach to maintaining the change log and preparing the release notes.
+There is a two-pronged approach to maintaining the change log and preparing the release notes.
-1. For work that is documented in JIRA, we can run reports that include all of
+1. For work that is documented in JIRA, run the release notes report to include all of
the tickets targeted for a specific release. This report can be included in the
release announcement.
-2. The manual change log (CHANGELOG.asciidoc) can be used to highlight large
+2. The manual change log (`CHANGELOG.asciidoc`) can be used to highlight large
changes, describe themes (e.g. "We focused on performance improvements") or to
give voice to undocumented changes.
-### Branches
+Given the dependence on the JIRA report for generating additions to the `CHANGELOG.asciidoc`,
+which uses the title of the issue as the line presented in the release note report, titles should
+be edited prior to release to be useful in that context. In other words, an issue title should
+be understandable as a change in the fewest words possible while still conveying the gist of the
+change.
+
+Changes that break the public APIs should be marked with a "breaking" label and should be
+distinguished from other changes in the release notes.
-We maintain the "master" branch as the one where most people would be developing.
+### Branches
-Additionally, we may have release branches for maintenance work. For example,
-the "tp30" branch is used to maintain the 3.0.x line while work on 3.1.x
-proceeds on "master".
+The "master" branch is used for the main line of development and release branches are constructed
+for ongoing maintenance work. For example, the "tp30" branch is used to maintain the 3.0.x line
+while work on 3.1.x proceeds on "master".
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
way to account for the branch lifecycle, i.e. "Who's branch is this, and can I
-delete it?" For example, TINKERPOP3-999-add-cool-new-feature is a nice branch
-name.
+delete it?"
-For branches that are NOT associated with JIRA issues, you are free to use your
-Apache ID as a branch name prefix. This provides a unique namespace, and also a
-way to account for the branch lifecycle.
+For branches that are NOT associated with JIRA issues, developers should utilize their Apache ID as
+a branch name prefix. This provides a unique namespace, and also a way to account for the branch lifecycle.
-Please remove your own branches when they are no longer needed.
+Developers should remove their own branches when they are no longer needed.
### Tags
-We use tags for milestones, release candidates, and approved releases. Please
+Tags are used for milestones, release candidates, and approved releases. Please
refrain from creating arbitrary tags, as they produce permanent clutter.
[4/6] incubator-tinkerpop git commit: Merge branch
'TINKERPOP3-791-committer-doc' of
https://github.com/RedSeal-co/incubator-tinkerpop into tp30
Posted by sp...@apache.org.
Merge branch 'TINKERPOP3-791-committer-doc' of https://github.com/RedSeal-co/incubator-tinkerpop into tp30
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/21b1ef71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/21b1ef71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/21b1ef71
Branch: refs/heads/tp30
Commit: 21b1ef717077813eb027b03e88d7ccdede8fe77e
Parents: b0bf744 2be03c0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 10 06:37:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 10 06:37:08 2015 -0400
----------------------------------------------------------------------
CONTRIBUTING.asciidoc | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
[2/6] incubator-tinkerpop git commit: Update changelog.
Posted by sp...@apache.org.
Update changelog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3c6df3c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3c6df3c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3c6df3c2
Branch: refs/heads/tp30
Commit: 3c6df3c287ec3507cc1af8e9d5e75a8cd1694cc8
Parents: 5311329
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 31 13:02:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 31 13:02:08 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3c6df3c2/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 84f408f..7363e7d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Clarified semantics of `Transaction.close()` in unit tests - now refers only to closing the current transaction in the current thread.
+* `Neo4jGraph` no longer uses `OptOut` on `TransactionTest.shouldRollbackOnCloseWhenConfigured` (formerly `shouldRollbackOnShutdownWhenConfigured`)
* Gremlin Server initialization scripts can now return a `Map` of values that will become global bindings for the server.
* Introduced the `--dryRun` option to the document generation process which ignores actual script execution in the Gremlin Console.
* Fixed bug in `EventStrategy` around property changed events when calling `property` without cardinality or meta-property values.