Skip to content

This is the uber pull request with GEOWAVE-667, GEOWAVE-831, HBase#850

Merged
rfecher merged 23 commits intomasterfrom
GEOWAVE-667-831-merge-hbase
Jul 12, 2016
Merged

This is the uber pull request with GEOWAVE-667, GEOWAVE-831, HBase#850
rfecher merged 23 commits intomasterfrom
GEOWAVE-667-831-merge-hbase

Conversation

@rfecher
Copy link
Copy Markdown
Contributor

@rfecher rfecher commented Jul 8, 2016

No description provided.

rfecher and others added 22 commits June 17, 2016 16:46
Conflicts:
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/AccumuloDataStore.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/AccumuloIndexWriter.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/query/AbstractAccumuloRowQuery.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/query/AccumuloConstraintsQuery.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/query/AccumuloFilteredIndexQuery.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/query/QueryFilterIterator.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/util/AccumuloUtils.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/util/EntryIteratorWrapper.java
hbaseRefactor

Conflicts:
	core/index/src/main/java/mil/nga/giat/geowave/core/index/sfc/tiered/TieredSFCIndexStrategy.java
	core/store/src/main/java/mil/nga/giat/geowave/core/store/index/IndexMetaDataSet.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/AccumuloDataStore.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/AccumuloOperations.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/mapreduce/AccumuloMRUtils.java
	extensions/datastores/accumulo/src/main/java/mil/nga/giat/geowave/datastore/accumulo/metadata/AbstractAccumuloPersistence.java
	extensions/datastores/accumulo/src/test/java/mil/nga/giat/geowave/datastore/accumulo/TransformWriterTest.java
@rfecher rfecher force-pushed the GEOWAVE-667-831-merge-hbase branch 7 times, most recently from e9a21fc to d0a01c2 Compare July 11, 2016 19:58
@rfecher rfecher force-pushed the GEOWAVE-667-831-merge-hbase branch from d0a01c2 to f1e3d4b Compare July 11, 2016 20:36
@rfecher rfecher merged commit 7f1194e into master Jul 12, 2016
@rfecher rfecher deleted the GEOWAVE-667-831-merge-hbase branch July 12, 2016 15:44
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Jul 12, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Jul 19, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Jul 24, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Jul 28, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Aug 9, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Aug 10, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
jamesmcclain pushed a commit to jamesmcclain/geotrellis that referenced this pull request Aug 11, 2016
It was apparently removed in
locationtech/geowave#850 commit ef18428.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants