You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/12/06 04:52:51 UTC
[1/2] git commit: ACCUMULO-1793 updates Hadoop 2 profile to match
version used in other dev branches. Includes updating slf4j based on what
comes with Hadoop 2.2.0.
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 975881c10 -> f65becad0
ACCUMULO-1793 updates Hadoop 2 profile to match version used in other dev branches. Includes updating slf4j based on what comes with Hadoop 2.2.0.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1d5ed48f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d5ed48f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d5ed48f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1d5ed48f94fbbac3b10d18db4148b4dae79f2880
Parents: 00fb08b
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Thu Dec 5 12:38:52 2013 -0600
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 5 22:33:23 2013 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1d5ed48f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a46609..bda5076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -932,9 +932,9 @@
</property>
</activation>
<properties>
- <hadoop.version>2.0.4-alpha</hadoop.version>
+ <hadoop.version>2.2.0</hadoop.version>
<httpclient.version>3.1</httpclient.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
</properties>
</profile>
</profiles>
[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f65becad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f65becad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f65becad
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f65becad07ed5affe05e82bae5d9fa32611fab2f
Parents: 975881c 1d5ed48
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 5 22:52:30 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 5 22:52:30 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------