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
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.j
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: http://git
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4120
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f4120
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
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.j
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
Branch:
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: http://
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: http://git-wip-us.apache.org/repos/asf/accumulo/comm
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: http://git-wip-us.apache.org/repos/asf/accum
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: http://git-wip-us.apache.org/repos/asf/accum
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: http://git-wip-us.apache.org/repos/asf/accumulo/comm
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: http://git-wip-us.apache.org/repos/asf/accum
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdb27e97
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdb27e97
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
Branch:
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: http://git-wip-us.apache.org/repos/asf/accumulo/c
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
a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.jav
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
b/core/
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: http://git-wip-us.apache.org/repos/asf/accumulo/dif
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
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thri
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
b/cor
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
b/proxy/src/main/java/org/ap
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
--- a/proxy/src/main/pyth
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
--- a/proxy/src
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: http://git-wip-us.apache.org/repos/asf/a
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
a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegatio
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
---
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsE
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
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletS
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurit
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWrite
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
b/proxy
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 bc08e9b..a98dd6
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
b/core/src/main/java
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
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientS
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
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveSc
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
b/proxy/src/m
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
--
dif
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
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/Ac
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStat
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
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift
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
--- a/
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
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundExcep
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
b
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.jav
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
b
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
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClien
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
a/core/src/main/java/org/apache/accumulo/core/replication/thrift/R
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
a/core/src/main/java/org/apache/accumulo/core/replication/thrif
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
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState
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
b
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
b/core/src/main
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
--
diff --git
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrate
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
a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.j
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
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
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/Con
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: http://git-wip
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
Branch:
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: http://git-
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e86fabb8
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9bf
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff
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: http://git-wip-us.apache.org/repos/asf/accumulo/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2247ead/proxy/src/main/python/ttypes.py
--
diff --cc proxy/src/main/python/ttypes.py
index 69269bc,3f9ec9c..ca90543
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/py
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9bf
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9bf
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: http://git-wip-
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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e86fabb8
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: http://git-wip-us.apache.org/repos/asf/accumulo/
70 matches
Mail list logo