You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/09/29 20:50:28 UTC
[12/12] accumulo git commit: ACCUMULO-4012 possible infinite loop
when the base transaction is removed before scanning it, merge 1.6 to 1.7
ACCUMULO-4012 possible infinite loop when the base transaction is removed before scanning it, merge 1.6 to 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ecbc3c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ecbc3c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ecbc3c2
Branch: refs/heads/1.7
Commit: 1ecbc3c28702f0f60eb8a468cf38afc308d268a4
Parents: e0621df d301f4e
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Sep 29 14:48:50 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Sep 29 14:48:50 2015 -0400
----------------------------------------------------------------------
LICENSE | 3 -
assemble/bin-LICENSE | 334 ++++++++++++++++++-
.../java/org/apache/accumulo/fate/ZooStore.java | 26 +-
server/base/pom.xml | 29 ++
server/base/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++
server/base/src/main/javadoc/META-INF/NOTICE | 5 +
server/monitor/pom.xml | 29 ++
.../monitor/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++
server/monitor/src/main/javadoc/META-INF/NOTICE | 5 +
server/tserver/pom.xml | 29 ++
shell/.gitignore | 1 +
11 files changed, 853 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/assemble/bin-LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --cc fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 8115fd5,6f5ea70..4b4a83f
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@@ -16,7 -16,8 +16,8 @@@
*/
package org.apache.accumulo.fate;
-import static com.google.common.base.Charsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
+ import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/server/base/pom.xml
----------------------------------------------------------------------
diff --cc server/base/pom.xml
index bba0c74,45d15ea..3e6186d
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@@ -127,30 -118,34 +127,59 @@@
<directory>src/test/resources</directory>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-javadocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/javadoc/META-INF/</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
+ <profiles>
+ <profile>
+ <id>protobuf</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-protobuf</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <executable>${basedir}/src/main/scripts/generate-protobuf.sh</executable>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/server/monitor/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/server/tserver/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ecbc3c2/shell/.gitignore
----------------------------------------------------------------------
diff --cc shell/.gitignore
index 56204d2,0000000..59a826f
mode 100644,000000..100644
--- a/shell/.gitignore
+++ b/shell/.gitignore
@@@ -1,25 -1,0 +1,26 @@@
+# 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.
+
+# Maven ignores
+/target/
+
+# IDE ignores
+/.settings/
+/.project
+/.classpath
+/.pydevproject
+/.idea
+/*.iml
++/bin/