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 2016/08/30 11:13:25 UTC
[1/3] tinkerpop git commit: Fixed scripts target directory
Repository: tinkerpop
Updated Branches:
refs/heads/master 401ef65d2 -> d2fc54f96
Fixed scripts target directory
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/db8ee8a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/db8ee8a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/db8ee8a2
Branch: refs/heads/master
Commit: db8ee8a2c3c5472fec6f6560817548d3b015fc2e
Parents: f0ab088
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Aug 30 06:50:28 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Aug 30 06:50:28 2016 -0400
----------------------------------------------------------------------
gremlin-server/src/assembly/distribution.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db8ee8a2/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/assembly/distribution.xml b/gremlin-server/src/assembly/distribution.xml
index e132a81..58e5532 100644
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@ -41,6 +41,7 @@ limitations under the License.
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/scripts</directory>
<directory>scripts</directory>
</fileSet>
<fileSet>
[2/3] tinkerpop git commit: Really fixed scripts target directory
Posted by sp...@apache.org.
Really fixed scripts target directory
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4780bc29
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4780bc29
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4780bc29
Branch: refs/heads/master
Commit: 4780bc29bffc3ffe3940769816a811bdf2383602
Parents: db8ee8a
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Aug 30 07:01:31 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Aug 30 07:01:31 2016 -0400
----------------------------------------------------------------------
gremlin-server/src/assembly/distribution.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4780bc29/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/assembly/distribution.xml b/gremlin-server/src/assembly/distribution.xml
index 58e5532..d4c8bb8 100644
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@ -42,7 +42,7 @@ limitations under the License.
</fileSet>
<fileSet>
<directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/scripts</directory>
- <directory>scripts</directory>
+ <outputDirectory>scripts</outputDirectory>
</fileSet>
<fileSet>
<directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory>
[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-server/src/assembly/distribution.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d2fc54f9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d2fc54f9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d2fc54f9
Branch: refs/heads/master
Commit: d2fc54f96acff85d55bc9c6472740a42415adc57
Parents: 401ef65 4780bc2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 30 07:13:11 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 30 07:13:11 2016 -0400
----------------------------------------------------------------------
gremlin-server/src/assembly/distribution.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------