[tinkerpop] 01/01: Merge branch '3.4-dev'

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 4ec8ddc5ec54abfa7af7cac73c9bce3db443ed91
Merge: 52a3dab 68c1935
Author: stephen <sp...@gmail.com>
AuthorDate: Thu Jan 9 07:03:11 2020 -0500

    Merge branch '3.4-dev'

 docs/src/dev/developer/contributing.asciidoc       |  2 +-
 docs/src/dev/developer/for-committers.asciidoc     | 30 ++++++++++++----------
 docs/src/dev/developer/release.asciidoc            |  2 +-
 docs/src/dev/future/index.asciidoc                 | 18 ++++++-------
 .../gremlin/structure/io/gryo/GryoVersion.java     |  2 +-
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --cc docs/src/dev/developer/for-committers.asciidoc
index f835190,5e555c3..7a4e311
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@@ -92,15 -92,17 +92,17 @@@ distinguished from other changes in th
  
  TinkerPop has several release branches:
  
- * `tp30` - 3.0.x (no longer maintained)
- * `tp31` - 3.1.x (no longer maintained)
- * `tp32` - 3.2.x (no longer maintained)
- * `tp33` - 3.3.x (current development)
- * `tp34` - 3.4.x (current development)
+ * `3.0-dev` - 3.0.x (no longer maintained)
+ * `3.1-dev` - 3.1.x (no longer maintained)
+ * `3.2-dev` - 3.2.x (no longer maintained)
 -* `3.3-dev` - 3.3.x (major bug fixes only)
++* `3.3-dev` - 3.3.x (no longer maintained)
+ * `3.4-dev` - 3.4.x (current development)
  * `master` - 3.5.x (future development)
+ * `4.0-dev` - 4.0.x (future development)
  
- 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.
+ Changes to `3.3-dev` should merge to `3.4-dev` and then `3.4-dev` to `master`. Please read more about this process in
+ the <<pull-requests, Pull Requests>> section. Note that `4.0-dev` is rebased on `master` and currently behaves as a
+ fresh repository as all 3.x content was removed.
  
  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