You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/02/22 22:42:53 UTC
[1/2] logging-log4j2 git commit: Fix spacing of license header
Repository: logging-log4j2
Updated Branches:
refs/heads/master d329cf38a -> d82dba5d8
Fix spacing of license header
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5dda63d1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5dda63d1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5dda63d1
Branch: refs/heads/master
Commit: 5dda63d18f4d61587e8e7b3c2f56db67af9fba48
Parents: 84b55aa
Author: rgoers <ra...@dslextreme.com>
Authored: Sun Feb 22 14:41:14 2015 -0700
Committer: rgoers <ra...@dslextreme.com>
Committed: Sun Feb 22 14:41:14 2015 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/util/Strings.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5dda63d1/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
index ecd4783..5e8c9a5 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
@@ -1,19 +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.
-*/
+ * 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.logging.log4j.util;
/**
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2
Posted by rg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d82dba5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d82dba5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d82dba5d
Branch: refs/heads/master
Commit: d82dba5d8213562217a7a681674409d46dbdb4ae
Parents: 5dda63d d329cf3
Author: rgoers <ra...@dslextreme.com>
Authored: Sun Feb 22 14:41:33 2015 -0700
Committer: rgoers <ra...@dslextreme.com>
Committed: Sun Feb 22 14:41:33 2015 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/jmx/Server.java | 58 +++++++++++++-------
src/changes/changes.xml | 5 ++
src/site/xdoc/faq.xml | 5 +-
src/site/xdoc/manual/configuration.xml.vm | 10 ++++
4 files changed, 56 insertions(+), 22 deletions(-)
----------------------------------------------------------------------