Skip to content

Commit 3a5bf4e

Browse files
committed
Merge branch 'master' into hadoop-2.1.0
2 parents b9ff67e + 1b72670 commit 3a5bf4e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<packaging>jar</packaging>
77
<!-- from now, we will update version manually and ignore maven snapshot
88
features -->
9-
<version>2.3.8</version>
9+
<version>2.3.10</version>
1010
<name>glusterfs-hadoop</name>
1111
<url>http://maven.apache.org</url>
1212

src/main/java/org/apache/hadoop/fs/glusterfs/Version.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ public Version() {
2121
}
2222
catch(Throwable t){
2323
LOG.warn("Couldn't find GIT properties for version info " +
24-
t.getMessage()+". This jar may have been built OUTSIDE a GIT repo.");
24+
t +". This jar may have been built OUTSIDE a GIT repo.");
2525
}
2626
}
2727
public String getTag(){
2828
String commit = this.getProperty("git.commit.id.describe");
29-
String tag = commit != null ?
29+
final String tag = commit != null ?
3030
commit.split("-")[0]:
3131
"no version info available. check log warnings.";
32-
return commit.split("-")[0];
32+
33+
return tag;
3334
}
3435

3536
/**

0 commit comments

Comments
 (0)