Merge branch 'master' into GORA-339
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/40cc7a5b Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/40cc7a5b Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/40cc7a5b Branch: refs/heads/master Commit: 40cc7a5b680a7c4aececb0777a38adf352b7de6e Parents: 475027d dce6a66 Author: Lewis John McGibbney <[email protected]> Authored: Tue Jun 17 15:27:02 2014 -0400 Committer: Lewis John McGibbney <[email protected]> Committed: Tue Jun 17 15:27:02 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ .../test/resources/gora-accumulo-mapping.xml | 4 +-- .../src/test/conf/gora-cassandra-mapping.xml | 4 +-- .../org/apache/gora/compiler/templates/enum.vm | 35 ++++++++++++++++++++ .../apache/gora/compiler/templates/record.vm | 5 +-- .../src/test/conf/gora-dynamodb-mapping.xml | 4 +-- gora-hbase/src/test/conf/gora-hbase-mapping.xml | 4 +-- .../src/test/conf/gora-mongodb-mapping.xml | 4 +-- gora-mongodb/src/test/conf/multimapping.xml | 4 +-- gora-solr/src/test/conf/gora-solr-mapping.xml | 4 +-- gora-sql/src/test/conf/gora-sql-mapping.xml | 4 +-- gora-tutorial/conf/gora-cassandra-mapping.xml | 4 +-- gora-tutorial/conf/gora-hbase-mapping.xml | 4 +-- gora-tutorial/conf/gora-solr-mapping.xml | 4 +-- gora-tutorial/conf/gora-sql-mapping.xml | 4 +-- 15 files changed, 66 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
