[06/10] accumulo git commit: ACCUMULO-4519 regenerate thrift

2017-02-09 Thread ctubbsii
ACCUMULO-4519 regenerate thrift Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9bf10ff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9bf10ff Diff:

[01/10] accumulo git commit: ACCUMULO-4519 patch from Yudong Wu

2017-02-09 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.7 13d3f5deb -> a9bf10fff refs/heads/1.8 a4ef3e09f -> e86fabb87 refs/heads/master 1e000359f -> e2247ead5 ACCUMULO-4519 patch from Yudong Wu Adds missing system permission and namespace functionality to the proxy. Project:

[08/10] accumulo git commit: Merge branch '1.7' into 1.8

2017-02-09 Thread ctubbsii
Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e86fabb8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e86fabb8 Diff:

[02/10] accumulo git commit: ACCUMULO-4519 patch from Yudong Wu

2017-02-09 Thread ctubbsii
ACCUMULO-4519 patch from Yudong Wu Adds missing system permission and namespace functionality to the proxy. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/025aacc9 Tree:

[03/10] accumulo git commit: ACCUMULO-4519 patch from Yudong Wu

2017-02-09 Thread ctubbsii
ACCUMULO-4519 patch from Yudong Wu Adds missing system permission and namespace functionality to the proxy. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/025aacc9 Tree:

[10/10] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread ctubbsii
Merge branch '1.8' This closes #217 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e2247ead Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e2247ead Diff:

[07/10] accumulo git commit: Merge branch '1.7' into 1.8

2017-02-09 Thread ctubbsii
Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e86fabb8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e86fabb8 Diff:

[04/10] accumulo git commit: ACCUMULO-4519 regenerate thrift

2017-02-09 Thread ctubbsii
ACCUMULO-4519 regenerate thrift Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9bf10ff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9bf10ff Diff:

[1/2] accumulo git commit: ACCUMULO-4480 - update testing section of user manual for 1.8

2017-02-09 Thread mjwall
Repository: accumulo Updated Branches: refs/heads/master 62bbce43e -> 1e000359f ACCUMULO-4480 - update testing section of user manual for 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4ef3e09 Tree:

[2/2] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mjwall
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1e000359 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1e000359 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1e000359

accumulo git commit: ACCUMULO-4480 - update testing section of user manual for 1.8

2017-02-09 Thread mjwall
Repository: accumulo Updated Branches: refs/heads/1.8 bdb27e978 -> a4ef3e09f ACCUMULO-4480 - update testing section of user manual for 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4ef3e09 Tree:

[29/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java

[24/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java -- diff --git

[32/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java

[20/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java -- diff --git

[17/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java -- diff --git

[02/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/ruby/accumulo_proxy.rb -- diff --git a/proxy/src/main/ruby/accumulo_proxy.rb b/proxy/src/main/ruby/accumulo_proxy.rb index e02ba16..3c02507 100644 ---

[37/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java -- diff --git

[28/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java -- diff --git

[25/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java

[31/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java

[15/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java

[19/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java -- diff --git

[08/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java

[01/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/master 8be77dfd9 -> 62bbce43e http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java --

[13/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java

[27/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java -- diff --git

[12/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java -- diff --git

[36/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java -- diff --git

[38/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java -- diff --git

[04/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/constants.py -- diff --git a/proxy/src/main/python/constants.py b/proxy/src/main/python/constants.py index 8139236..3b2f97a 100644 ---

[40/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
ACCUMULO-4551 Add thrift-gen changes from 0.10.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62bbce43 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62bbce43 Diff:

[21/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java -- diff --git

[05/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/AccumuloProxy.py -- diff --git a/proxy/src/main/python/AccumuloProxy.py b/proxy/src/main/python/AccumuloProxy.py index 19bd257..ea6e63a 100644

[14/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java -- diff --git

[39/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java -- diff --git

[07/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java -- diff --git

[23/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java -- diff --git

[10/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java -- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java

[26/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java

[16/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java -- diff --git

[06/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/AccumuloProxy-remote -- diff --git a/proxy/src/main/python/AccumuloProxy-remote b/proxy/src/main/python/AccumuloProxy-remote index

[33/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java

[18/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java -- diff --git

[09/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java -- diff --git

[34/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java -- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java

[11/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java -- diff --git

[03/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/ttypes.py -- diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py index 87a977d..69269bc 100644 ---

[35/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java -- diff --git

[41/41] accumulo git commit: ACCUMULO-4551 Update to thrift 0.10.0

2017-02-09 Thread ctubbsii
ACCUMULO-4551 Update to thrift 0.10.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ead6674e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ead6674e Diff:

[1/4] accumulo git commit: ACCUMULO-4479 Removing UPGRADING.md in favor

2017-02-09 Thread mjwall
Repository: accumulo Updated Branches: refs/heads/master b1beefde8 -> 8be77dfd9 ACCUMULO-4479 Removing UPGRADING.md in favor of adding upgrade instructions to release notes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[4/4] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mjwall
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8be77dfd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8be77dfd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8be77dfd

[3/4] accumulo git commit: Merge branch '1.7' into 1.8

2017-02-09 Thread mjwall
Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bdb27e97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdb27e97 Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

2017-02-09 Thread mjwall
Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bdb27e97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdb27e97 Diff:

[2/3] accumulo git commit: Merge branch 'mjwall-ACCUMULO-4481' into 1.7

2017-02-09 Thread mjwall
Merge branch 'mjwall-ACCUMULO-4481' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/13d3f5de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d3f5de Diff:

[1/3] accumulo git commit: ACCUMULO-4479 Removing UPGRADING.md in favor

2017-02-09 Thread mjwall
Repository: accumulo Updated Branches: refs/heads/1.8 f4120422b -> bdb27e978 ACCUMULO-4479 Removing UPGRADING.md in favor of adding upgrade instructions to release notes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/4] accumulo git commit: Merge branch 'mjwall-ACCUMULO-4481' into 1.7

2017-02-09 Thread mjwall
Merge branch 'mjwall-ACCUMULO-4481' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/13d3f5de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d3f5de Diff:

[2/2] accumulo git commit: Merge branch 'mjwall-ACCUMULO-4481' into 1.7

2017-02-09 Thread mjwall
Merge branch 'mjwall-ACCUMULO-4481' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/13d3f5de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d3f5de Diff:

[1/2] accumulo git commit: ACCUMULO-4479 Removing UPGRADING.md in favor

2017-02-09 Thread mjwall
Repository: accumulo Updated Branches: refs/heads/1.7 78176e594 -> 13d3f5deb ACCUMULO-4479 Removing UPGRADING.md in favor of adding upgrade instructions to release notes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[1/4] accumulo git commit: ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId

2017-02-09 Thread mmiller
Repository: accumulo Updated Branches: refs/heads/master d2e217b13 -> b1beefde8 ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78176e59 Tree:

[4/4] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mmiller
Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1beefde Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1beefde Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1beefde

[2/4] accumulo git commit: Merge branch 'ACCUMULO-4577_1.7' into 1.8

2017-02-09 Thread mmiller
Merge branch 'ACCUMULO-4577_1.7' into 1.8 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java

[3/4] accumulo git commit: ACCUMULO-4577: Fix merge error

2017-02-09 Thread mmiller
ACCUMULO-4577: Fix merge error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4120422 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4120422 Diff:

[3/3] accumulo git commit: ACCUMULO-4577: Fix merge error

2017-02-09 Thread mmiller
ACCUMULO-4577: Fix merge error Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4120422 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4120422 Diff:

[1/3] accumulo git commit: ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId

2017-02-09 Thread mmiller
Repository: accumulo Updated Branches: refs/heads/1.8 04847d97d -> f4120422b ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78176e59 Tree:

[2/3] accumulo git commit: Merge branch 'ACCUMULO-4577_1.7' into 1.8

2017-02-09 Thread mmiller
Merge branch 'ACCUMULO-4577_1.7' into 1.8 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java