Author: mahadev
Date: Thu Jul 28 22:02:18 2011
New Revision: 1152018
URL: http://svn.apache.org/viewvc?rev=1152018&view=rev
Log:
ZOOKEEPER-1138. release audit failing for a number of new files. (phunt via mahadev)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/NOTICE.txt
zookeeper/trunk/build.xml
zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/help/index.html
zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml
zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg
zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeVeiwers.cfg
zookeeper/trunk/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Jul 28 22:02:18 2011
@@ -268,6 +268,8 @@ BUGFIXES:
ZOOKEEPER-1090. Race condition while taking snapshot can lead to not restoring data tree
correctly (Vishal K via breed)
+ ZOOKEEPER-1138. release audit failing for a number of new files. (phunt via mahadev)
+
IMPROVEMENTS:
ZOOKEEPER-724. Improve junit test integration - log harness information
(phunt via mahadev)
Modified: zookeeper/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/NOTICE.txt?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/NOTICE.txt (original)
+++ zookeeper/trunk/NOTICE.txt Thu Jul 28 22:02:18 2011
@@ -1,5 +1,5 @@
Apache ZooKeeper
-Copyright 2009 The Apache Software Foundation
+Copyright 2009-2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Thu Jul 28 22:02:18 2011
@@ -1188,6 +1188,8 @@
<exclude name="src/java/test/checkstyle*.xml"/>
<exclude name="src/java/test/checkstyle*.xsl"/>
<exclude name="src/java/test/config/findbugs*.xml"/>
+ <exclude name="src/**/*.vcproj"/>
+ <exclude name="src/**/*.sln"/>
</fileset>
</rat:report>
</target>
Modified: zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/help/index.html
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/help/index.html?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/help/index.html (original)
+++ zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/help/index.html Thu Jul 28
22:02:18 2011
@@ -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.
+-->
<h1>ZooKeeper Browser</h1>
Modified: zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml (original)
+++ zookeeper/trunk/src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml Thu Jul 28
22:02:18 2011
@@ -1,3 +1,17 @@
+# 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.
copyright: Apache License v2.0
version: 0.1
description: ZooKeeper Browser
Modified: zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg (original)
+++ zookeeper/trunk/src/contrib/zooinspector/config/defaultConnectionSettings.cfg Thu Jul
28 22:02:18 2011
@@ -1,5 +1,20 @@
-#Default connection for ZooInspector
-#Sun Feb 28 14:46:55 GMT 2010
-hosts=localhost\:2181
-encryptionManager=org.apache.zookeeper.inspector.encryption.BasicDataEncryptionManager
-timeout=5000
+# 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.
+#
+#Default connection for ZooInspector
+#Sun Feb 28 14:46:55 GMT 2010
+hosts=localhost\:2181
+encryptionManager=org.apache.zookeeper.inspector.encryption.BasicDataEncryptionManager
+timeout=5000
Modified: zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeVeiwers.cfg
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeVeiwers.cfg?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeVeiwers.cfg (original)
+++ zookeeper/trunk/src/contrib/zooinspector/config/defaultNodeVeiwers.cfg Thu Jul 28 22:02:18
2011
@@ -1,3 +1,17 @@
+# 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.
org.apache.zookeeper.inspector.gui.nodeviewer.NodeViewerData
org.apache.zookeeper.inspector.gui.nodeviewer.NodeViewerMetaData
org.apache.zookeeper.inspector.gui.nodeviewer.NodeViewerACL
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java Thu
Jul 28 22:02:18 2011
@@ -1,3 +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.
+ */
+
package org.apache.zookeeper;
import junit.framework.TestCase;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java?rev=1152018&r1=1152017&r2=1152018&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java Thu
Jul 28 22:02:18 2011
@@ -1,3 +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.
+ */
+
package org.apache.zookeeper.server.quorum;
import java.io.BufferedOutputStream;
|