cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 20 Nov 2015 16:25:37 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ac831f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ac831f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ac831f3

Branch: refs/heads/cassandra-3.0
Commit: 6ac831f3273aa55e012bb1cb9953ea25e55e81a2
Parents: fee9791 49d9e51
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Nov 20 17:24:42 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Nov 20 17:24:42 2015 +0100

----------------------------------------------------------------------
 build.xml                                       | 180 +---------
 ide/idea-iml-file.xml                           |  68 ++++
 ide/idea/inspectionProfiles/Project_Default.xml |  38 +-
 ide/idea/misc.xml                               |   4 +
 ide/idea/vcs.xml                                |   6 +
 ide/idea/workspace.xml                          | 359 +++++++++++++++++++
 6 files changed, 447 insertions(+), 208 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ac831f3/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ac831f3/ide/idea-iml-file.xml
----------------------------------------------------------------------
diff --cc ide/idea-iml-file.xml
index 0000000,63d0e1d..e6c4aee
mode 000000,100644..100644
--- a/ide/idea-iml-file.xml
+++ b/ide/idea-iml-file.xml
@@@ -1,0 -1,69 +1,68 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+   ~ 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.
+   -->
+ 
+ <module type="JAVA_MODULE" version="4">
 -    <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
++    <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+         <output url="file://$MODULE_DIR$/.idea/out/main" />
+         <output-test url="file://$MODULE_DIR$/.idea/out/test" />
+         <exclude-output />
+         <content url="file://$MODULE_DIR$">
+             <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+             <sourceFolder url="file://$MODULE_DIR$/src/gen-java" isTestSource="false"
/>
+             <sourceFolder url="file://$MODULE_DIR$/src/resources" type="java-resource"
/>
+             <sourceFolder url="file://$MODULE_DIR$/interface/thrift/gen-java" isTestSource="false"
/>
+             <sourceFolder url="file://$MODULE_DIR$/tools/stress/src" isTestSource="false"
/>
+             <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
+             <sourceFolder url="file://$MODULE_DIR$/test/long" isTestSource="true" />
+             <sourceFolder url="file://$MODULE_DIR$/test/microbench" isTestSource="true"
/>
+             <sourceFolder url="file://$MODULE_DIR$/test/burn" isTestSource="true" />
 -            <sourceFolder url="file://$MODULE_DIR$/test/pig" isTestSource="true" />
+             <sourceFolder url="file://$MODULE_DIR$/test/resources" type="java-test-resource"
/>
+             <excludeFolder url="file://$MODULE_DIR$/.idea" />
+             <excludeFolder url="file://$MODULE_DIR$/.settings" />
+             <excludeFolder url="file://$MODULE_DIR$/build" />
+             <excludeFolder url="file://$MODULE_DIR$/data"/>
+             <excludeFolder url="file://$MODULE_DIR$/logs"/>
+         </content>
+         <orderEntry type="inheritedJdk" />
+         <orderEntry type="sourceFolder" forTests="false" />
+         <orderEntry type="module-library">
+             <library>
+                 <CLASSES>
+                     <root url="file://$MODULE_DIR$/lib" />
+                 </CLASSES>
+                 <JAVADOC />
+                 <SOURCES />
+                 <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+             </library>
+         </orderEntry>
+         <orderEntry type="module-library">
+             <library>
+                 <CLASSES>
+                     <root url="file://$MODULE_DIR$/build/lib/jars" />
+                 </CLASSES>
+                 <JAVADOC />
+                 <SOURCES>
+                     <root url="file://$MODULE_DIR$/build/lib/sources" />
+                 </SOURCES>
+                 <jarDirectory url="file://$MODULE_DIR$/build/lib/jars" recursive="false"
/>
+                 <jarDirectory url="file://$MODULE_DIR$/build/lib/sources" recursive="false"
type="SOURCES" />
+             </library>
+         </orderEntry>
+     </component>
+ </module>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ac831f3/ide/idea/inspectionProfiles/Project_Default.xml
----------------------------------------------------------------------
diff --cc ide/idea/inspectionProfiles/Project_Default.xml
index aa640e8,a609ae3..2edbb70
--- a/ide/idea/inspectionProfiles/Project_Default.xml
+++ b/ide/idea/inspectionProfiles/Project_Default.xml
@@@ -53,9 -56,6 +56,7 @@@
      <inspection_tool class="JavaLangImport" enabled="true" level="WARNING" enabled_by_default="true"
/>
      <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING"
enabled_by_default="true" />
      <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="WARNING"
enabled_by_default="true" />
 +    <inspection_tool class="LengthOneStringsInConcatenation" enabled="true" level="WARNING"
enabled_by_default="true" />
-     <inspection_tool class="ListIndexOfReplaceableByContains" enabled="true" level="WARNING"
enabled_by_default="true" />
-     <inspection_tool class="LiteralAsArgToStringEquals" enabled="true" level="WARNING"
enabled_by_default="true" />
      <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING"
enabled_by_default="false">
        <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger"
/>
        <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger"
/>


Mime
View raw message