Merge remote-tracking branch 'upstream/trunk' into GORA_199 Conflicts: gora-accumulo/pom.xml gora-compiler-cli/pom.xml gora-compiler/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/d59ad4bc Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/d59ad4bc Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/d59ad4bc Branch: refs/heads/master Commit: d59ad4bc0de5ec77ce7f137177734f7e4375f64a Parents: ab2102a 97ddc8a Author: Damien Raude-Morvan <dam...@dictanova.com> Authored: Wed May 7 23:50:36 2014 +0200 Committer: Damien Raude-Morvan <dam...@dictanova.com> Committed: Wed May 7 23:50:36 2014 +0200 ---------------------------------------------------------------------- KEYS | 200 +++++++++++------------------------------ NOTICE.txt | 2 +- gora-accumulo/pom.xml | 5 +- gora-cassandra/pom.xml | 2 +- gora-compiler-cli/pom.xml | 2 +- gora-compiler/pom.xml | 2 +- gora-core/pom.xml | 2 +- gora-hbase/pom.xml | 2 +- gora-solr/pom.xml | 5 +- gora-tutorial/pom.xml | 2 +- pom.xml | 11 ++- sources-dist/pom.xml | 2 +- 12 files changed, 76 insertions(+), 161 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/d59ad4bc/pom.xml ----------------------------------------------------------------------