You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flagon.apache.org by po...@apache.org on 2022/06/19 15:10:13 UTC
[incubator-flagon] branch master updated (c2140a0 -> 6ed724c)
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-flagon.git
from c2140a0 Merge branch 'asf-site'
add 0b26659 FLAGON-488 Add JSDELIVR documentation to UserALE JS
new 5211534 resolving merge conflicts
new 6ed724c Merge branch 'master' into lewismc-asf-site
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
site/_docs/useralejs/index.md | 10 ++++++++--
site/_site/docs/useralejs/index.html | 9 +++++++--
site/_site/feed.xml | 1 -
3 files changed, 15 insertions(+), 5 deletions(-)
[incubator-flagon] 02/02: Merge branch 'master' into lewismc-asf-site
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-flagon.git
commit 6ed724cda9d4d4bdc7abd0d3088447a6af3a5ac6
Merge: 5211534 c2140a0
Author: poorejc <po...@apache.org>
AuthorDate: Sun Jun 19 11:09:07 2022 -0400
Merge branch 'master' into lewismc-asf-site
site/_docs/stack/index.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[incubator-flagon] 01/02: resolving merge conflicts
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-flagon.git
commit 5211534c3e4bcbdf4b3da46ae452315b661dc1fd
Merge: 0b29210 0b26659
Author: poorejc <po...@apache.org>
AuthorDate: Sun Jun 19 11:08:57 2022 -0400
resolving merge conflicts
site/_docs/useralejs/index.md | 10 ++++++++--
site/_site/docs/useralejs/index.html | 9 +++++++--
site/_site/feed.xml | 1 -
3 files changed, 15 insertions(+), 5 deletions(-)
diff --cc site/_site/feed.xml
index ff34120,a34893a..b5fc7b9
--- a/site/_site/feed.xml
+++ b/site/_site/feed.xml
@@@ -1,2 -1,1 +1,1 @@@
-<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="http://flagon.incubator.apache.org/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.6.3">Jekyll</generator><link href="http://flagon.incubator.apache.org/feed.xml" rel="self" type="application/atom+xml" /><link href="http://flagon.incubator.apache.org/" rel="alternate" type="text/html" /><updated>2021-06-03T19:40:41+00:00</updated><id>http://flagon.incuba [...]
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" href="http://flagon.incubator.apache.org/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="http://jekyllrb.com" version="3.6.3">Jekyll</generator><link href="http://flagon.incubator.apache.org/feed.xml" rel="self" type="application/atom+xml" /><link href="http://flagon.incubator.apache.org/" rel="alternate" type="text/html" /><updated>2021-06-24T03:22:45+00:00</updated><id>http://flagon.incuba [...]
-