Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/459a4b2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/459a4b2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/459a4b2f Branch: refs/heads/TINKERPOP-1331 Commit: 459a4b2f5989c8891e5f2a4a7ea39ce15304ffad Parents: 7b88477 97f0238 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Jun 7 14:36:03 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Jun 7 14:36:03 2016 -0400 ---------------------------------------------------------------------- DISCLAIMER | 7 ------- gremlin-console/src/assembly/distribution.xml | 4 ---- gremlin-server/src/assembly/distribution.xml | 4 ---- 3 files changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/459a4b2f/gremlin-server/src/assembly/distribution.xml ----------------------------------------------------------------------
