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

[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: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e86fabb8

Branch: refs/heads/master
Commit: e86fabb87730abce15ca8f66459cdd44372aeadf
Parents: a4ef3e0 a9bf10f
Author: Christopher Tubbs 
Authored: Thu Feb 9 16:45:46 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:45:46 2017 -0500

--
 proxy/src/main/cpp/proxy_types.cpp| 14 +++---
 proxy/src/main/cpp/proxy_types.h  |  6 +-
 .../accumulo/proxy/thrift/SystemPermission.java   | 14 +-
 proxy/src/main/python/ttypes.py   | 12 
 proxy/src/main/ruby/proxy_types.rb|  8 ++--
 proxy/src/main/thrift/proxy.thrift|  4 
 6 files changed, 51 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/cpp/proxy_types.cpp
--
diff --cc proxy/src/main/cpp/proxy_types.cpp
index 09c2d9c,4a626f5..87ef7ac
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@@ -83,34 -84,14 +87,38 @@@ const char* _kSystemPermissionNames[] 
"CREATE_USER",
"DROP_USER",
"ALTER_USER",
-   "SYSTEM"
+   "SYSTEM",
+   "CREATE_NAMESPACE",
+   "DROP_NAMESPACE",
+   "ALTER_NAMESPACE",
+   "OBTAIN_DELEGATION_TOKEN"
  };
- const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
+ const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
  
 +int _kNamespacePermissionValues[] = {
 +  NamespacePermission::READ,
 +  NamespacePermission::WRITE,
 +  NamespacePermission::ALTER_NAMESPACE,
 +  NamespacePermission::GRANT,
 +  NamespacePermission::ALTER_TABLE,
 +  NamespacePermission::CREATE_TABLE,
 +  NamespacePermission::DROP_TABLE,
 +  NamespacePermission::BULK_IMPORT,
 +  NamespacePermission::DROP_NAMESPACE
 +};
 +const char* _kNamespacePermissionNames[] = {
 +  "READ",
 +  "WRITE",
 +  "ALTER_NAMESPACE",
 +  "GRANT",
 +  "ALTER_TABLE",
 +  "CREATE_TABLE",
 +  "DROP_TABLE",
 +  "BULK_IMPORT",
 +  "DROP_NAMESPACE"
 +};
 +const std::map 
_NamespacePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(9, 
_kNamespacePermissionValues, _kNamespacePermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
 +
  int _kScanTypeValues[] = {
ScanType::SINGLE,
ScanType::BATCH

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/cpp/proxy_types.h
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/python/ttypes.py
--
diff --cc proxy/src/main/python/ttypes.py
index 87a977d,a748c0a..3f9ec9c
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@@ -112,43 -120,12 +120,47 @@@ class SystemPermission
  "DROP_USER": 5,
  "ALTER_USER": 6,
  "SYSTEM": 7,
+ "CREATE_NAMESPACE": 8,
+ "DROP_NAMESPACE": 9,
+ "ALTER_NAMESPACE": 10,
+ "OBTAIN_DELEGATION_TOKEN": 11,
}
  
 +class NamespacePermission:
 +  READ = 0
 +  WRITE = 1
 +  ALTER_NAMESPACE = 2
 +  GRANT = 3
 +  ALTER_TABLE = 4
 +  CREATE_TABLE = 5
 +  DROP_TABLE = 6
 +  BULK_IMPORT = 7
 +  DROP_NAMESPACE = 8
 +
 +  _VALUES_TO_NAMES = {
 +0: "READ",
 +1: "WRITE",
 +2: "ALTER_NAMESPACE",
 +3: "GRANT",
 +4: "ALTER_TABLE",
 +5: "CREATE_TABLE",
 +6: "DROP_TABLE",
 +7: "BULK_IMPORT",
 +8: "DROP_NAMESPACE",
 +  }
 +
 +  _NAMES_TO_VALUES = {
 +"READ": 0,
 +"WRITE": 1,
 +"ALTER_NAMESPACE": 2,
 +"GRANT": 3,
 +"ALTER_TABLE": 4,
 +"CREATE_TABLE": 5,
 +"DROP_TABLE": 6,
 +"BULK_IMPORT": 7,
 +"DROP_NAMESPACE": 8,
 +  }
 +
  class ScanType:
SINGLE = 0
BATCH = 1

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/ruby/proxy_types.rb
--
diff --cc proxy/src/main/ruby/proxy_types.rb
index e542df6,522c80c..ddf8a18
---

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

2016-09-28 Thread elserj

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/fdc33170
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fdc33170
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fdc33170

Branch: refs/heads/master
Commit: fdc331705320175a23cebcb5d2abed834016227d
Parents: 5a8669a b19de71
Author: Josh Elser 
Authored: Wed Sep 28 12:46:52 2016 -0400
Committer: Josh Elser 
Committed: Wed Sep 28 12:46:52 2016 -0400

--
 .../main/asciidoc/chapters/administration.txt| 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fdc33170/docs/src/main/asciidoc/chapters/administration.txt
--
diff --cc docs/src/main/asciidoc/chapters/administration.txt
index a2dab8e,de8920a..1a06d06
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@@ -63,20 -63,20 +63,23 @@@ In addition, the user can provide +0+ a
  ephemeral port is likely to be unique and not already bound. Thus, 
configuring ports to
  use +0+ instead of an explicit value, should, in most cases, work around any 
issues of
  running multiple distinct Accumulo instances (or any other process which 
tries to use the
 -same default ports) on the same hardware.
 +same default ports) on the same hardware. Finally, the *.port.client 
properties will work
 +with the port range syntax (M-N) allowing the user to specify a range of 
ports for the
 +service to attempt to bind. The ports in the range will be tried in a 1-up 
manner starting
 +at the low end of the range to, and including, the high end of the range.
  
  === Installation
- Choose a directory for the Accumulo installation. This directory will be 
referenced
- by the environment variable +$ACCUMULO_HOME+. Run the following:
  
-   $ tar xzf accumulo-1.6.0-bin.tar.gz# unpack to subdirectory
-   $ mv accumulo-1.6.0 $ACCUMULO_HOME # move to desired location
+ Download a binary distribution of Accumulo and install it to a directory on a 
disk with
+ sufficient space:
  
- Repeat this step at each machine within the cluster. Usually all machines 
have the
- same +$ACCUMULO_HOME+.
+   cd 
+   tar xzf accumulo-X.Y.Z-bin.tar.gz   # Replace 'X.Y.Z' with your Accumulo 
version
+   cd accumulo-X.Y.Z
+ 
+ Repeat this step on each machine in your cluster. Typically, the same 
++
+ is chosen for all machines in the cluster. When you configure Accumulo, the 
+$ACCUMULO_HOME+
+ environment variable should be set to +/path/to//accumulo-X.Y.Z+.
  
  === Dependencies
  Accumulo requires HDFS and ZooKeeper to be configured and running

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

2016-08-30 Thread elserj

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d28a3ee3/test/src/main/java/org/apache/accumulo/test/categories/AnyClusterTest.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/categories/AnyClusterTest.java
index 000,000..765057e
new file mode 100644
--- /dev/null
+++ b/test/src/main/java/org/apache/accumulo/test/categories/AnyClusterTest.java
@@@ -1,0 -1,0 +1,25 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to you under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.apache.accumulo.test.categories;
++
++/**
++ * Interface to be used with JUnit Category annotation to denote that the 
IntegrationTest can be used with any kind of cluster (a MiniAccumuloCluster or a
++ * StandaloneAccumuloCluster).
++ */
++public interface AnyClusterTest {
++
++}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d28a3ee3/test/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java
index 000,000..1a972ef
new file mode 100644
--- /dev/null
+++ 
b/test/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java
@@@ -1,0 -1,0 +1,24 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to you under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.apache.accumulo.test.categories;
++
++/**
++ * Interface to be used with JUnit Category annotation to denote that the 
IntegrationTest requires the use of a MiniAccumuloCluster.
++ */
++public interface MiniClusterOnlyTest {
++
++}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d28a3ee3/test/src/main/java/org/apache/accumulo/test/categories/package-info.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/categories/package-info.java
index 000,000..e7071fc
new file mode 100644
--- /dev/null
+++ b/test/src/main/java/org/apache/accumulo/test/categories/package-info.java
@@@ -1,0 -1,0 +1,21 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to you under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++/**
++ * JUnit categories for the various types of Accumulo integration tests.
++ */
++package org.apache.accumulo.test.categories;
++

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d28a3ee3/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
index 29f2780,000..8dbbc12
mode 100644,00..100644
---

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

2016-08-16 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/5e53631b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e53631b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e53631b

Branch: refs/heads/1.8
Commit: 5e53631b2bb5cc9f85de728d7217fe495dfe4fdd
Parents: 711b421 7eb4a09
Author: Christopher Tubbs 
Authored: Tue Aug 16 20:17:48 2016 -0400
Committer: Christopher Tubbs 
Committed: Tue Aug 16 20:17:48 2016 -0400

--
 .../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java  | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5e53631b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
--

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

2016-08-11 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/93e188f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/93e188f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/93e188f6

Branch: refs/heads/1.8
Commit: 93e188f625f75c5486ac3603d581cfb40bc18b8d
Parents: e6d1ee2 4885470
Author: Christopher Tubbs 
Authored: Thu Aug 11 21:24:56 2016 -0400
Committer: Christopher Tubbs 
Committed: Thu Aug 11 21:24:56 2016 -0400

--
 assemble/build.sh | 2 ++
 1 file changed, 2 insertions(+)
--

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

2016-08-10 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/e6d1ee25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6d1ee25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6d1ee25

Branch: refs/heads/1.8
Commit: e6d1ee2549cd340a2d924bf5617b7083698b6edf
Parents: f1c3f38 78638cb
Author: Christopher Tubbs 
Authored: Wed Aug 10 17:49:28 2016 -0400
Committer: Christopher Tubbs 
Committed: Wed Aug 10 17:49:28 2016 -0400

--
 server/native/src/main/resources/Makefile | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--

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

2016-08-10 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/f1c3f38d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1c3f38d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1c3f38d

Branch: refs/heads/1.8
Commit: f1c3f38d82d6601c9d326417b1bffa9102068749
Parents: 3fded56 a7b482a
Author: Christopher Tubbs 
Authored: Wed Aug 10 16:09:38 2016 -0400
Committer: Christopher Tubbs 
Committed: Wed Aug 10 16:09:38 2016 -0400

--
 server/native/src/main/resources/Makefile | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)
--

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

2016-08-01 Thread elserj

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/36f8fcc7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36f8fcc7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36f8fcc7

Branch: refs/heads/1.8
Commit: 36f8fcc7f578044b01d0f445b2fab6dc65bb610b
Parents: 74507ae 268922b
Author: Josh Elser 
Authored: Mon Aug 1 16:55:25 2016 -0400
Committer: Josh Elser 
Committed: Mon Aug 1 16:55:25 2016 -0400

--
 .../org/apache/accumulo/test/ShellServerIT.java | 24 ++--
 1 file changed, 7 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/36f8fcc7/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --cc test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index 61d3d4a,000..8db0185
mode 100644,00..100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -1,1894 -1,0 +1,1884 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test;
 +
 +import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.BufferedReader;
 +import java.io.File;
 +import java.io.FileReader;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +import java.io.PrintWriter;
 +import java.lang.reflect.Constructor;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Random;
 +import java.util.concurrent.TimeUnit;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.client.impl.Namespaces;
 +import org.apache.accumulo.core.client.sample.RowSampler;
 +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 +import org.apache.accumulo.core.client.security.tokens.KerberosToken;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVWriter;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.util.format.Formatter;
 +import org.apache.accumulo.core.util.format.FormatterConfig;
 +import org.apache.accumulo.harness.SharedMiniClusterBase;
 +import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
 +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.test.functional.SlowIterator;
 +import org.apache.accumulo.tracer.TraceServer;
 +import org.apache.commons.configuration.ConfigurationException;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.commons.lang.StringUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import

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

2016-06-09 Thread elserj

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/cb25e77a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cb25e77a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cb25e77a

Branch: refs/heads/1.8
Commit: cb25e77a2df29a7839a1d77357c4e6e6beafb82f
Parents: 6a5a817 462dfbc
Author: Josh Elser 
Authored: Thu Jun 9 18:40:45 2016 -0400
Committer: Josh Elser 
Committed: Thu Jun 9 18:40:45 2016 -0400

--

--

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

2016-06-08 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/8d954e2c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d954e2c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8d954e2c

Branch: refs/heads/1.8
Commit: 8d954e2ca1c782601ffbce56ccc78de43a63650b
Parents: eff4547 e743695
Author: Christopher Tubbs 
Authored: Wed Jun 8 20:39:40 2016 -0400
Committer: Christopher Tubbs 
Committed: Wed Jun 8 20:39:40 2016 -0400

--
 test/src/main/resources/log4j.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d954e2c/test/src/main/resources/log4j.properties
--
diff --cc test/src/main/resources/log4j.properties
index 965c1ca,000..6041ee5
mode 100644,00..100644
--- a/test/src/main/resources/log4j.properties
+++ b/test/src/main/resources/log4j.properties
@@@ -1,57 -1,0 +1,57 @@@
 +# Licensed to the Apache Software Foundation (ASF) under one or more
 +# contributor license agreements.  See the NOTICE file distributed with
 +# this work for additional information regarding copyright ownership.
 +# The ASF licenses this file to You under the Apache License, Version 2.0
 +# (the "License"); you may not use this file except in compliance with
 +# the License.  You may obtain a copy of the License at
 +#
 +# http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
 +log4j.rootLogger=DEBUG, CA
 +log4j.appender.CA=org.apache.log4j.ConsoleAppender
 +log4j.appender.CA.layout=org.apache.log4j.PatternLayout
 +log4j.appender.CA.layout.ConversionPattern=%d{ISO8601} [%c{2}] %-5p: %m%n
 +
 +log4j.logger.org.apache.accumulo.core=DEBUG
 +log4j.logger.org.apache.accumulo.core.client.impl.MasterClient=INFO
 +log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR
 +log4j.logger.org.apache.accumulo.core.util.shell.Shell.audit=OFF
 +log4j.logger.org.apache.accumulo.core.util.shell.Shell=FATAL
 +log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN
 +log4j.logger.org.apache.hadoop.io.compress.CodecPool=WARN
 +log4j.logger.org.apache.hadoop.mapred=ERROR
 +log4j.logger.org.apache.hadoop.tools.DistCp=WARN
 +log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
 +log4j.logger.org.apache.hadoop.util.ProcessTree=WARN
++log4j.logger.org.apache.zookeeper=INFO
 +log4j.logger.org.apache.zookeeper.ClientCnxn=FATAL
- log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=INFO
 +log4j.logger.org.apache.zookeeper.ZooKeeper=WARN
 +log4j.logger.org.apache.accumulo.core.file.rfile.bcfile=INFO
 +log4j.logger.org.apache.accumulo.server.util.ReplicationTableUtil=TRACE
 +log4j.logger.org.apache.accumulo.core.client.impl.ThriftScanner=INFO
 +log4j.logger.org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock=WARN
 +log4j.logger.org.mortbay.log=WARN
 +log4j.logger.org.apache.hadoop=WARN
 +log4j.logger.org.apache.jasper=INFO
 +log4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=WARN
 +log4j.logger.org.apache.hadoop.hdfs.server.datanode.DataNode.clienttrace=WARN
 +log4j.logger.BlockStateChange=WARN
 
+log4j.logger.org.apache.accumulo.core.client.impl.TabletServerBatchReaderIterator=INFO
 +log4j.logger.org.apache.hadoop.security=INFO
 +log4j.logger.org.apache.hadoop.minikdc=DEBUG
 +log4j.logger.org.apache.directory=INFO
 +log4j.logger.org.apache.directory.api.ldap=WARN
 +# This is really spammy at debug
 +log4j.logger.org.apache.thrift.transport.TSaslTransport=INFO
 +# From apache-ds/minikdc
 +log4j.logger.org.apache.mina=INFO
 +log4j.logger.org.apache.accumulo.server.thrift.UGIAssumingProcessor=TRACE
 +log4j.logger.org.apache.hadoop.security.UserGroupInformation=INFO
 +# For debugging replication tests.
- log4j.logger.org.apache.accumulo.master.MasterDrainImpl=TRACE
++log4j.logger.org.apache.accumulo.master.MasterDrainImpl=TRACE

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

2016-05-26 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/fd37134c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd37134c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd37134c

Branch: refs/heads/1.8
Commit: fd37134c9b86b83ad8f0e57301ab50beda54e789
Parents: e15b023 e7e0f38
Author: Christopher Tubbs 
Authored: Thu May 26 22:23:13 2016 -0400
Committer: Christopher Tubbs 
Committed: Thu May 26 22:23:13 2016 -0400

--
 assemble/pom.xml|   2 -
 assemble/src/main/assemblies/component.xml  |  16 +-
 maven-plugin/pom.xml|   6 +
 .../org/apache/accumulo/plugin/PluginIT.java| 136 ---
 .../org/apache/accumulo/plugin/it/PluginIT.java | 137 +++
 pom.xml | 234 +--
 server/native/pom.xml   |   1 -
 test/pom.xml|   2 +
 8 files changed, 213 insertions(+), 321 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/assemble/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/maven-plugin/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/pom.xml
--
diff --cc pom.xml
index 8241b64,3cbba12..f783731
--- a/pom.xml
+++ b/pom.xml
@@@ -24,12 -24,18 +24,18 @@@

org.apache.accumulo
accumulo-project
 -  1.7.2-SNAPSHOT
 +  1.8.0-SNAPSHOT
pom
Apache Accumulo Project
-   Apache Accumulo is a sorted, distributed key/value store based 
on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, 
and Thrift. It features a few novel improvements on the BigTable design in the 
form of cell-level access labels and a server-side programming mechanism that 
can modify key/value pairs at various points in the data management 
process.
-   
-   http://accumulo.apache.org/maven-site/
+   Apache Accumulo is a sorted, distributed key/value store based
+ on Google's BigTable design. It is built on top of Apache Hadoop,
+ Zookeeper, and Thrift. It features a few novel improvements on the 
BigTable
+ design in the form of cell-level access labels and a server-side
+ programming mechanism that can modify key/value pairs at various points in
+ the data management process.
+   
+   https://accumulo.apache.org

2011

@@@ -109,23 -114,12 +115,16 @@@
  Apache Jenkins
  https://builds.apache.org/view/A-D/view/Accumulo/

-   
- 
-   accumulo.mvn.website
-   Accumulo Maven Site
-   
-   
scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site
- 
-   

 +
 +
org.apache.accumulo.test.PerformanceTest
  
  ${project.version}
+ gnu
  
  1.50
 +
 +2.7.1
  
  
${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml
  
@@@ -614,23 -589,8 +620,13 @@@
  
  
org.apache.maven.plugins
 +  maven-shade-plugin
 +  2.3
 +
 +
 +  org.apache.maven.plugins
-   maven-assembly-plugin
-   
- false
- 
- accumulo-${project.version}
- gnu
-   
- 
- 
-   org.apache.maven.plugins
maven-changes-plugin
-   2.11
+   2.12

  
JIRA

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/server/native/pom.xml
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/test/pom.xml
--
diff --cc test/pom.xml
index 6da0f0e,a5533bd..ea2e374
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -238,49 -233,8 +238,50 @@@
  

  
 +
 +  org.apache.maven.plugins
 +  maven-jar-plugin
 +  
 +
++  create-iterator-test-jar
 +  
 +test-jar
 +  
 +  pre-integration-test
 +  
 +TestIterators
 +
 +
 +  
org/apache/accumulo/test/functional/ValueReversingIterator.class
 +
 +  
 +
 +  
 +

  
 +
 +  
 +org.codehaus.mojo
 +exec-maven-plugin
 +
 +  
 +check-for-misplaced-ITs
 +

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

2016-05-18 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/d950d354
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d950d354
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d950d354

Branch: refs/heads/1.8
Commit: d950d3548637b057ed296c2582d4b5c70a76ff73
Parents: 73b4fbb 7cffcfc
Author: Christopher Tubbs 
Authored: Wed May 18 17:31:50 2016 -0400
Committer: Christopher Tubbs 
Committed: Wed May 18 17:31:50 2016 -0400

--
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d950d354/pom.xml
--

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

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

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

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

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

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

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

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

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

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

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

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

12 matches

Site Navigation

Mail list logo

Footer information