You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by le...@apache.org on 2016/05/27 01:11:03 UTC
gora git commit: GORA-445 spark dependency scope have changed as
provided
Repository: gora
Updated Branches:
refs/heads/master da1030681 -> 73250856a
GORA-445 spark dependency scope have changed as provided
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/73250856
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/73250856
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/73250856
Branch: refs/heads/master
Commit: 73250856a0ca54da7f8a0e0b4a6360d7d374e28f
Parents: da10306
Author: cihad guzel <cg...@gmail.com>
Authored: Fri May 27 01:52:24 2016 +0300
Committer: cihad guzel <cg...@gmail.com>
Committed: Fri May 27 01:52:24 2016 +0300
----------------------------------------------------------------------
gora-core/pom.xml | 1 +
gora-core/src/main/java/org/apache/gora/util/TimingUtil.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/73250856/gora-core/pom.xml
----------------------------------------------------------------------
diff --git a/gora-core/pom.xml b/gora-core/pom.xml
index d12717d..b28a9a9 100644
--- a/gora-core/pom.xml
+++ b/gora-core/pom.xml
@@ -147,6 +147,7 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
<version>${spark.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
http://git-wip-us.apache.org/repos/asf/gora/blob/73250856/gora-core/src/main/java/org/apache/gora/util/TimingUtil.java
----------------------------------------------------------------------
diff --git a/gora-core/src/main/java/org/apache/gora/util/TimingUtil.java b/gora-core/src/main/java/org/apache/gora/util/TimingUtil.java
index 8e14d42..dfda2fe 100644
--- a/gora-core/src/main/java/org/apache/gora/util/TimingUtil.java
+++ b/gora-core/src/main/java/org/apache/gora/util/TimingUtil.java
@@ -28,7 +28,7 @@ public class TimingUtil {
* Calculate the elapsed time between two times specified in milliseconds.
* @param start The start of the time period
* @param end The end of the time period
- * @return a string of the form "XhYmZs" when the elapsed time is X hours, Y minutes and Z seconds or null if start > end.
+ * @return a string of the form "XhYmZs" when the elapsed time is X hours, Y minutes and Z seconds or null if start {@literal >} end.
*/
public static String elapsedTime(long start, long end){
if (start > end) {