You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/28 20:18:06 UTC
[01/10] accumulo git commit: ACCUMULO-3856 Sort pom
Repository: accumulo
Updated Branches:
refs/heads/1.5 362b8ac33 -> f974f6d50
refs/heads/1.6 244eeb671 -> b7fcc2f66
refs/heads/1.7 9e08255f6 -> 84ccd5ce3
refs/heads/master 0c7ddfe94 -> 071f6fe0b
ACCUMULO-3856 Sort pom
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f974f6d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f974f6d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f974f6d5
Branch: refs/heads/1.5
Commit: f974f6d5022fba74736c4d0712533819b3ac01e9
Parents: 362b8ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:14:23 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:14:23 2015 -0400
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f974f6d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc3be32..1bc9ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -755,8 +755,8 @@
<module name="OuterTypeFilename" />
<module name="LineLength">
<!-- needs extra, because Eclipse formatter ignores the ending left brace -->
- <property name="max" value="200"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="max" value="200" />
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
</module>
<module name="AvoidStarImport" />
<module name="UnusedImports">
[09/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
proxy/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84ccd5ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84ccd5ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/84ccd5ce
Branch: refs/heads/master
Commit: 84ccd5ce320da6da982987ec81ac5c587ad49614
Parents: 9e08255 b7fcc2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:17:13 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:17:13 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/10] accumulo git commit: ACCUMULO-3856 Sort pom
Posted by ct...@apache.org.
ACCUMULO-3856 Sort pom
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f974f6d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f974f6d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f974f6d5
Branch: refs/heads/1.7
Commit: f974f6d5022fba74736c4d0712533819b3ac01e9
Parents: 362b8ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:14:23 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:14:23 2015 -0400
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f974f6d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc3be32..1bc9ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -755,8 +755,8 @@
<module name="OuterTypeFilename" />
<module name="LineLength">
<!-- needs extra, because Eclipse formatter ignores the ending left brace -->
- <property name="max" value="200"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="max" value="200" />
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
</module>
<module name="AvoidStarImport" />
<module name="UnusedImports">
[08/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
proxy/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84ccd5ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84ccd5ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/84ccd5ce
Branch: refs/heads/1.7
Commit: 84ccd5ce320da6da982987ec81ac5c587ad49614
Parents: 9e08255 b7fcc2f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:17:13 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:17:13 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/10] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7fcc2f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7fcc2f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7fcc2f6
Branch: refs/heads/master
Commit: b7fcc2f66f35b435764d8f35c737cdfb2db623fb
Parents: 244eeb6 f974f6d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:15:08 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:15:08 2015 -0400
----------------------------------------------------------------------
proxy/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7fcc2f6/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index ee106c7,b75935a..75961b0
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -82,13 -90,13 +82,13 @@@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
++ <groupId>org.easymock</groupId>
++ <artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymock</artifactId>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
[05/10] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7fcc2f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7fcc2f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7fcc2f6
Branch: refs/heads/1.7
Commit: b7fcc2f66f35b435764d8f35c737cdfb2db623fb
Parents: 244eeb6 f974f6d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:15:08 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:15:08 2015 -0400
----------------------------------------------------------------------
proxy/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7fcc2f6/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index ee106c7,b75935a..75961b0
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -82,13 -90,13 +82,13 @@@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
++ <groupId>org.easymock</groupId>
++ <artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymock</artifactId>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
[04/10] accumulo git commit: ACCUMULO-3856 Sort pom
Posted by ct...@apache.org.
ACCUMULO-3856 Sort pom
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f974f6d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f974f6d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f974f6d5
Branch: refs/heads/master
Commit: f974f6d5022fba74736c4d0712533819b3ac01e9
Parents: 362b8ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:14:23 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:14:23 2015 -0400
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f974f6d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc3be32..1bc9ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -755,8 +755,8 @@
<module name="OuterTypeFilename" />
<module name="LineLength">
<!-- needs extra, because Eclipse formatter ignores the ending left brace -->
- <property name="max" value="200"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="max" value="200" />
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
</module>
<module name="AvoidStarImport" />
<module name="UnusedImports">
[06/10] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7fcc2f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7fcc2f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7fcc2f6
Branch: refs/heads/1.6
Commit: b7fcc2f66f35b435764d8f35c737cdfb2db623fb
Parents: 244eeb6 f974f6d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:15:08 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:15:08 2015 -0400
----------------------------------------------------------------------
proxy/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7fcc2f6/proxy/pom.xml
----------------------------------------------------------------------
diff --cc proxy/pom.xml
index ee106c7,b75935a..75961b0
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@@ -82,13 -90,13 +82,13 @@@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
++ <groupId>org.easymock</groupId>
++ <artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymock</artifactId>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
[10/10] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071f6fe0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/071f6fe0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/071f6fe0
Branch: refs/heads/master
Commit: 071f6fe0be788db495f762001f26d62f1c859739
Parents: 0c7ddfe 84ccd5c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:17:42 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:17:42 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/10] accumulo git commit: ACCUMULO-3856 Sort pom
Posted by ct...@apache.org.
ACCUMULO-3856 Sort pom
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f974f6d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f974f6d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f974f6d5
Branch: refs/heads/1.6
Commit: f974f6d5022fba74736c4d0712533819b3ac01e9
Parents: 362b8ac
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 28 14:14:23 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 28 14:14:23 2015 -0400
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f974f6d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc3be32..1bc9ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -755,8 +755,8 @@
<module name="OuterTypeFilename" />
<module name="LineLength">
<!-- needs extra, because Eclipse formatter ignores the ending left brace -->
- <property name="max" value="200"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="max" value="200" />
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
</module>
<module name="AvoidStarImport" />
<module name="UnusedImports">