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
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:
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:
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:
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
Repository: accumulo
Updated Branches:
refs/heads/1.7 15ae69c32 -> 78176e594
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:
ACCUMULO-2446: Updated to 1.8.0
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit:
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/5ab60510
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/5ab60510
Diff:
ACCUMULO-2446: many updates for Accumulo 1.8.0
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit:
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/e32632ca
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/e32632ca
Diff:
Repository: accumulo-wikisearch
Updated Branches:
refs/heads/1.8 dd23f1071 -> e32632caf (forced update)
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/e32632ca/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java
Repository: accumulo-wikisearch
Updated Branches:
refs/heads/1.8 [created] dd23f1071
ACCUMULO-2446: many updates for Accumulo 1.8.0
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit:
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/dd23f107
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
--
diff --git
Repository: accumulo
Updated Branches:
refs/heads/master d4d7d0920 -> bebfbd0ed
ACCUMULO-4522: cleanup of unsed param in FileUtil
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a35b6dd
Tree:
ACCUMULO-4505: Another fix for shell errroneously reading conf
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c454414
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c454414
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
--
diff --git
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/bebfbd0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bebfbd0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bebfbd0e
Merge branch '1.7' into 1.8
Conflicts:
core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
Project:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
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/7c7bbabb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c7bbabb
Diff:
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/43b740bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43b740bc
Diff:
ACCUMULO-4525: replace meaningless method names
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4a45398
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4a45398
Diff:
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/7c7bbabb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c7bbabb
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.8 fcde1d93a -> 7c7bbabb8
ACCUMULO-4505: Another fix for shell errroneously reading conf
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c454414
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.7 a4a453986 -> 3c4544144
ACCUMULO-4505: Another fix for shell errroneously reading conf
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c454414
Tree:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/37ad8f50/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
Repository: accumulo
Updated Branches:
refs/heads/master 2551c2aa5 -> 37ad8f505
http://git-wip-us.apache.org/repos/asf/accumulo/blob/37ad8f50/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/37ad8f50/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
Repository: accumulo
Updated Branches:
refs/heads/ACCUMULO-4525_2.0 [deleted] 37ad8f505
ACCUMULO-4525: Replace meaningless method names
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/37ad8f50
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/37ad8f50
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/37ad8f50/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
Repository: accumulo
Updated Branches:
refs/heads/ACCUMULO-4525_2.0 [created] 37ad8f505
http://git-wip-us.apache.org/repos/asf/accumulo/blob/37ad8f50/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
http://git-wip-us.apache.org/repos/asf/accumulo/blob/37ad8f50/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
ACCUMULO-4525: replace meaningless method names
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4a45398
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4a45398
Diff:
Merge branch '1.7' into 1.8
Conflicts:
core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
Project:
Repository: accumulo
Updated Branches:
refs/heads/1.8 43b740bc7 -> fcde1d93a
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
--
diff
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
--
diff --git
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
ACCUMULO-4525: replace more meaningless method names
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fcde1d93
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fcde1d93
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
--
diff --git
Repository: accumulo
Updated Branches:
refs/heads/1.7 8a35b6dd4 -> a4a453986
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
--
diff
ACCUMULO-4525: replace meaningless method names
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4a45398
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4a45398
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.7 a361f63d6 -> 8a35b6dd4
ACCUMULO-4522: cleanup of unsed param in FileUtil
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a35b6dd
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.8 cd43958fe -> 43b740bc7
ACCUMULO-4522: cleanup of unsed param in FileUtil
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a35b6dd
Tree:
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/43b740bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43b740bc
Diff:
Repository: accumulo
Updated Branches:
refs/heads/master c02efeab2 -> 2551c2aa5
ACCUMULO-4522: cleanup of unsed param in FileUtil
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2551c2aa
Tree:
| [Cloudera][CLOUDERA] |
[ET][ET] |
| medined | David Medinets||
|
| mjwall| Michael Wall | [Objective Solutions, Inc.][OBJECTIVE] |
[ET][ET] |
+| mmiller | Michael Miller| [Centroid
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/cd43958f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cd43958f
Diff:
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/6fae53cb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6fae53cb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6fae53cb
Repository: accumulo
Updated Branches:
refs/heads/master 2bf55dce4 -> 6fae53cbe
ACCUMULO-4505: Fix for Shell erroneously reading accumulo-site.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a361f63d
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.7 32fd1004a -> a361f63d6
ACCUMULO-4505: Fix for Shell erroneously reading accumulo-site.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a361f63d
Tree:
Repository: accumulo
Updated Branches:
refs/heads/master 228bfc42b -> 2bf55dce4
ACCUMULO-3626: created warning prompt and force option for --reset-security
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2bf55dce
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/2255
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2255
Diff:
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/228bfc42
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/228bfc42
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/228bfc42
Repository: accumulo
Updated Branches:
refs/heads/master 9b4b4c0c8 -> 228bfc42b
ACCUMULO-4504: Improved the help for Shell zookeeper options
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32fd1004
Tree:
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/2255
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2255
Diff:
Repository: accumulo
Updated Branches:
refs/heads/1.8 09ee7b089 -> 22558
ACCUMULO-4504: Improved the help for Shell zookeeper options
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32fd1004
Tree:
Repository: accumulo
Updated Branches:
refs/heads/1.7 95f428584 -> 32fd1004a
ACCUMULO-4504: Improved the help for Shell zookeeper options
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32fd1004
Tree:
1001 - 1056 of 1056 matches
Mail list logo