You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/06/02 12:26:43 UTC
[49/49] incubator-kylin git commit: KYLIN 669 fix merge conflict
KYLIN 669 fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d09eae14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d09eae14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d09eae14
Branch: refs/heads/0.7.1
Commit: d09eae14cc549fd891ef7b0de8b9feca374edb54
Parents: f5dc6b9 0e6dc3a
Author: Luke Han <lu...@apache.org>
Authored: Tue Jun 2 18:25:12 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Tue Jun 2 18:25:12 2015 +0800
----------------------------------------------------------------------
pom.xml | 7 +++++--
src/main/config/assemblies/source-assembly.xml | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d09eae14/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 8f679d8,261ba58..1a80342
--- a/pom.xml
+++ b/pom.xml
@@@ -767,8 -739,8 +767,11 @@@
<exclude>webapp/app/css/AdminLTE.css</exclude>
<!-- jdbc log -->
-- <exclude>jdbc/kylin_jdbc.log.*</exclude>
-- <exclude>jdbc/kylin_jdbc.*</exclude>
++ <exclude>jdbc/kylin_jdbc.log*</exclude>
++
++
++ <!-- HBase MiniCluster Testing Data, for testing only -->
++ <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
</excludes>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d09eae14/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --cc src/main/config/assemblies/source-assembly.xml
index 40773db,d9f1501..9d658eb
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@@ -78,13 -82,10 +78,16 @@@ limitations under the License
<!-- release-plugin temp files -->
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.next]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.tag]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+ </exclude>
+
- <exclude>**/website/**</exclude>
</excludes>
</fileSet>
<!-- LICENSE, NOTICE, DEPENDENCIES, git.properties, etc. calculated at build time -->