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/04/03 16:03:10 UTC
[1/2] incubator-tinkerpop git commit: Using apache infrastructure now
under Jenkins for build server needs so travis is no longer needed.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master ddcc847c2 -> 4748e2521
Using apache infrastructure now under Jenkins for build server needs so travis is no longer needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e6c0907d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e6c0907d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e6c0907d
Branch: refs/heads/master
Commit: e6c0907d74bb291a9c070354baf39418806026bd
Parents: af4e5be
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 3 10:02:33 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 3 10:02:33 2015 -0400
----------------------------------------------------------------------
.travis.yml | 42 ------------------------------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6c0907d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 74aa613..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-language: java
-notifications:
- email:
- - okram@apache.org
- - spmva@genoprime.com
- - josh@fortytwo.net
- - daniel@thinkaurelius.com
- hipchat:
- secure: "KL0XyQjycrXTUjXSXmvjDTs5fdcAi2Gl2PbuYMWslT8BjxduhVHBZ4OpHSUEkcFLS66blS2SMZNDYfXu3lHWWSxLSoPXubf+BvTOmvBm/wOTudxmKj17UnPUvSbH+KW08mOJBhsJ/0Sok6pcfmjSKLvlau8muttGQ7Yexd0pIOs="
-jdk: oraclejdk8
-before_install:
- - if [[ ("$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "publish-docs") && "$TRAVIS_PULL_REQUEST" == "false" ]]; then git clone https://github.com/spmallette/travis-maven-deploy.git target/travis; fi
-script:
- - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then mvn install --settings target/travis/settings.xml -Dtravis; fi
- - if [[ "$TRAVIS_BRANCH" == "publish-docs" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then docs/preprocessor/preprocess.sh && mvn deploy --settings target/travis/settings.xml -Dasciidoc -Djavadoc; fi
- - if [[ ("$TRAVIS_BRANCH" != "master" && "$TRAVIS_BRANCH" != "publish-docs") || "$TRAVIS_PULL_REQUEST" == "true" ]]; then mvn test -Dtravis; fi
-env:
- global:
- # CI_DEPLOY_USERNAME
- - secure: "eA1+rkLXveAg81H7s0nUpbwi/aqmEQxHrOi1mmxd/vPpLc+lZlJ853VeRn0Y3Qqv0WdptC4EKeEeL9H6N0fRj4uzs97Yj1s4bkih60OWGYN2Oli03b6kE2I6CTCDlI36zoqrsV0MfrRb+0neCwZhnlHu44CH7Ja7JvGidLOAhpk="
- # CI_DEPLOY_PASSWORD
- - secure: "G8GXr6T2qdWry13EGz0JHKOPT+9AA4RIrB3WgW119Jda6WyUHnjdSuDQhpCQFKDq7NEFEx47rVmRslEEplaMIElHTOCDTOSRLGCf+/WcR7CMZh+LQxygfpLAsYzItC+F713tWRMRxc/EQC2Vs/pBe6js7fiBtGp8pHt2IdojDO8="
- # S3_DEPLOY_USERNAME
- - secure: "ASgksQmzF5MHwycIfmo6otcw9er90rNwJBVTK9IeA23Qkg6zki0MTVCXWBKNxxc5h4pkgxv5egfZgJxIk7fjvxvZZoHGURtGa/HJzO9O4+PS4T19RzSrQU/gu55iRYQMs12Zt0KJhJV5p0rWklrrkc83NAl+NLGs0hq4m7hnhoE="
- # S3_DEPLOY_PASSWORD
- - secure: "ph+XbOiCrVY9tUYj2f2RnL9vxR4a6oBvL54HAh050TGE4H7t0O2R9Lu9br7QaIdi4XGjKnq27NxhSG6TEbJDgEt3LeTmXNzt+WsGxxgiL4u00JFI7RHeJHlzKVTD5YR07CNVCKEIAZYZWOwdVoQ5DG+t+rcwCT9p9jnHOQBeObM="
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4748e252
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4748e252
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4748e252
Branch: refs/heads/master
Commit: 4748e25212d58e00ee13db9ab5371e922bde936b
Parents: e6c0907 ddcc847
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 3 10:03:04 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 3 10:03:04 2015 -0400
----------------------------------------------------------------------
.../process/computer/spark/SparkExecutor.java | 21 +++++++++++---------
.../spark/payload/ViewIncomingPayload.java | 4 ++++
2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------