You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2014/03/25 03:18:48 UTC
[1/3] git commit: ACCUMULO-2545 Add missing license headers
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 7b1a8e725 -> 5c659b578
refs/heads/1.5.2-SNAPSHOT ce6a7216d -> 70e50f31d
ACCUMULO-2545 Add missing license headers
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c659b57
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c659b57
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c659b57
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 5c659b578604c0714d0c64a58b8d098fb2c019b1
Parents: 7b1a8e7
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 24 22:16:16 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 24 22:16:16 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/IteratorSettingTest.java | 16 ++++++++++++++++
src/server/src/test/resources/log4j.properties | 17 ++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c659b57/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
----------------------------------------------------------------------
diff --git a/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
index ccb3cd6..3208d64 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.core.client;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c659b57/src/server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/server/src/test/resources/log4j.properties b/src/server/src/test/resources/log4j.properties
index 0b17793..2824491 100644
--- a/src/server/src/test/resources/log4j.properties
+++ b/src/server/src/test/resources/log4j.properties
@@ -1,3 +1,18 @@
+# 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=INFO, CA
log4j.appender.CA=org.apache.log4j.ConsoleAppender
log4j.appender.CA.layout=org.apache.log4j.PatternLayout
@@ -5,4 +20,4 @@ log4j.appender.CA.layout.ConversionPattern=[%t] %-5p %c %x - %m%n
log4j.logger.org.apache.zookeeper=ERROR,CA
log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR
-log4j.logger.org.apache.accumulo.server.security.Auditor=off
\ No newline at end of file
+log4j.logger.org.apache.accumulo.server.security.Auditor=off
[2/3] git commit: ACCUMULO-2545 Add missing license headers
Posted by md...@apache.org.
ACCUMULO-2545 Add missing license headers
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c659b57
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c659b57
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c659b57
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 5c659b578604c0714d0c64a58b8d098fb2c019b1
Parents: 7b1a8e7
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 24 22:16:16 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 24 22:16:16 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/IteratorSettingTest.java | 16 ++++++++++++++++
src/server/src/test/resources/log4j.properties | 17 ++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c659b57/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
----------------------------------------------------------------------
diff --git a/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
index ccb3cd6..3208d64 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.core.client;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c659b57/src/server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/server/src/test/resources/log4j.properties b/src/server/src/test/resources/log4j.properties
index 0b17793..2824491 100644
--- a/src/server/src/test/resources/log4j.properties
+++ b/src/server/src/test/resources/log4j.properties
@@ -1,3 +1,18 @@
+# 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=INFO, CA
log4j.appender.CA=org.apache.log4j.ConsoleAppender
log4j.appender.CA.layout=org.apache.log4j.PatternLayout
@@ -5,4 +20,4 @@ log4j.appender.CA.layout.ConversionPattern=[%t] %-5p %c %x - %m%n
log4j.logger.org.apache.zookeeper=ERROR,CA
log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR
-log4j.logger.org.apache.accumulo.server.security.Auditor=off
\ No newline at end of file
+log4j.logger.org.apache.accumulo.server.security.Auditor=off
[3/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
(--strategy ours)
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (--strategy ours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/70e50f31
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/70e50f31
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/70e50f31
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 70e50f31d666c467b209adb4ea8dbdf32200df35
Parents: ce6a721 5c659b5
Author: Mike Drob <md...@cloudera.com>
Authored: Mon Mar 24 22:18:01 2014 -0400
Committer: Mike Drob <md...@cloudera.com>
Committed: Mon Mar 24 22:18:01 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------