You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by cs...@apache.org on 2015/10/15 00:35:44 UTC
[1/2] incubator-apex-core git commit: APEX-132 #resolve added Apache
copyright template for IntelliJ
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 265e9088d -> ecb19fa78
APEX-132 #resolve added Apache copyright template for IntelliJ
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/50862129
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/50862129
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/50862129
Branch: refs/heads/devel-3
Commit: 5086212928f341581ca94cf415ae6ebd42a4bc31
Parents: b986f70
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Mon Oct 5 18:09:08 2015 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Tue Oct 6 22:43:36 2015 -0700
----------------------------------------------------------------------
.idea/copyright/apache.xml | 6 ++++++
.idea/copyright/profiles_settings.xml | 9 +++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/50862129/.idea/copyright/apache.xml
----------------------------------------------------------------------
diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml
new file mode 100644
index 0000000..12f481d
--- /dev/null
+++ b/.idea/copyright/apache.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+ <copyright>
+ <option name="myName" value="apache" />
+ <option name="notice" value="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>
+</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/50862129/.idea/copyright/profiles_settings.xml
----------------------------------------------------------------------
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..70dfce5
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+ <settings default="apache">
+ <LanguageOptions name="__TEMPLATE__">
+ <option name="addBlankAfter" value="false" />
+ <option name="separateBefore" value="true" />
+ <option name="lenBefore" value="2" />
+ </LanguageOptions>
+ </settings>
+</component>
\ No newline at end of file
[2/2] incubator-apex-core git commit: Merge branch 'APEX-132' into
devel-3
Posted by cs...@apache.org.
Merge branch 'APEX-132' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ecb19fa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ecb19fa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ecb19fa7
Branch: refs/heads/devel-3
Commit: ecb19fa783c0d5eaecfd9056681557d3343a44e7
Parents: 265e908 5086212
Author: Chandni Singh <cs...@apache.org>
Authored: Wed Oct 14 15:35:07 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Wed Oct 14 15:35:07 2015 -0700
----------------------------------------------------------------------
.idea/copyright/apache.xml | 6 ++++++
.idea/copyright/profiles_settings.xml | 9 +++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------