Merge branch 'master' of https://github.com/vaibhavthapliyal/gora
# Conflicts:
#
gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/4bbf52ee
Tree
Repository: gora
Updated Branches:
refs/heads/master 560704c3a -> 4bbf52ee7
Switched Accumulo Dependency to 1.7.1 and ported AccumuloStore Class to
work with accumulo 1.7.1
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/
http://git-wip-us.apache.org/repos/asf/gora/blob/4bbf52ee/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
--
diff --cc
gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
ind
Switched Accumulo Dependency to 1.7.1 and ported AccumuloStore Class to
work with 1.7.1
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/1d38afc4
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/1d38afc4
Diff: http://git-wi