You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/25 17:53:41 UTC
[07/24] incubator-tinkerpop git commit: Merge branch 'patch-2' of
https://github.com/ceefour/incubator-tinkerpop into tp31
Merge branch 'patch-2' of https://github.com/ceefour/incubator-tinkerpop into tp31
Newer version of slf4j included some good bug fixes since the version previously used. CTR
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1b4aec49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1b4aec49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1b4aec49
Branch: refs/heads/TINKERPOP-1236
Commit: 1b4aec491a93601c80df57c55068501ac12f885c
Parents: 6c4dc6f fc40b93
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 23 13:35:31 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 23 13:35:31 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1b4aec49/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 99194f3,29d7f4c..ea6314a
--- a/pom.xml
+++ b/pom.xml
@@@ -133,8 -133,8 +133,8 @@@ limitations under the License
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipIntegrationTests>true</skipIntegrationTests>
<skipPerformanceTests>true</skipPerformanceTests>
- <slf4j.version>1.7.12</slf4j.version>
+ <slf4j.version>1.7.19</slf4j.version>
- <hadoop.version>2.7.1</hadoop.version>
+ <hadoop.version>2.7.2</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.1</javadoc-plugin.version>