You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/05/27 21:04:42 UTC
[1/2] incubator-joshua git commit: Added the licence header
Repository: incubator-joshua
Updated Branches:
refs/heads/JOSHUA-252 ee4849f6a -> 63971074e
Added the licence header
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/cd78038d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/cd78038d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/cd78038d
Branch: refs/heads/JOSHUA-252
Commit: cd78038d898c0993f77bf3a16f840b7c01fcba10
Parents: 37420cd
Author: Thamme Gowda <tg...@gmail.com>
Authored: Fri May 27 14:00:53 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Fri May 27 14:00:53 2016 -0700
----------------------------------------------------------------------
src/main/resources/log4j.properties | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/cd78038d/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 2193edc..e2f671b 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/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 settings
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
[2/2] incubator-joshua git commit: Merge branch 'logger-hotfix' of
https://github.com/thammegowda/incubator-joshua into JOSHUA-252
Posted by mj...@apache.org.
Merge branch 'logger-hotfix' of https://github.com/thammegowda/incubator-joshua into JOSHUA-252
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/63971074
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/63971074
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/63971074
Branch: refs/heads/JOSHUA-252
Commit: 63971074ee0ecea48def85dbdbe0b5e384462850
Parents: ee4849f cd78038
Author: Matt Post <po...@cs.jhu.edu>
Authored: Fri May 27 17:04:29 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Fri May 27 17:04:29 2016 -0400
----------------------------------------------------------------------
src/main/resources/log4j.properties | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------