gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [3/3] git commit: Merge branch 'master' into GORA-374
Date Sun, 28 Sep 2014 03:10:35 GMT
Merge branch 'master' into GORA-374


Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/b712d9f9
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/b712d9f9
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/b712d9f9

Branch: refs/heads/master
Commit: b712d9f9da5e236319f1d88620ec09d60aaccea4
Parents: bc9a378 0c5eacf
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Sat Sep 27 20:02:10 2014 -0700
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Sat Sep 27 20:02:10 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  8 +++++
 .../gora/cassandra/store/CassandraClient.java   | 35 ++++++++++++++++----
 .../gora/cassandra/store/CassandraStore.java    |  2 +-
 .../apache/gora/mapreduce/GoraRecordWriter.java |  4 +++
 pom.xml                                         |  6 ++--
 5 files changed, 45 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/b712d9f9/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 825261f,32cfbdd..88cd405
--- a/pom.xml
+++ b/pom.xml
@@@ -635,9 -635,9 +635,9 @@@
      <restlet.version>2.2.1</restlet.version>
  
      <!-- Misc Dependencies -->
 -    <guava.version>13.0</guava.version>
 +    <guava.version>17.0</guava.version>
      <commons-lang.version>2.6</commons-lang.version>
-     <jdom.version>1.1.2</jdom.version>
+     <jdom.version>1.1.3</jdom.version>
      <hsqldb.version>2.2.8</hsqldb.version>
      <mysql.version>5.1.18</mysql.version>
      <xerces.version>2.9.1</xerces.version>


Mime
View raw message