You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by er...@apache.org on 2017/09/28 09:05:55 UTC

[royale-website] branch asf-site updated (b041811 -> 06e2e6f)

This is an automated email from the ASF dual-hosted git repository.

erikdebruin pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/royale-website.git.


    from b041811  Initial Commit
     add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
     new 06e2e6f  Merge branch 'master' into asf-site

The 1 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:
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].

[royale-website] 01/01: Merge branch 'master' into asf-site

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

erikdebruin pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/royale-website.git

commit 06e2e6f26a8a6f68804c3c7f157e3cee0dc261e8
Merge: b041811 f0aa422
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Thu Sep 28 11:05:45 2017 +0200

    Merge branch 'master' into asf-site

 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.

Re: [royale-website] branch asf-site updated (b041811 -> 06e2e6f)

Posted by Harbs <ha...@gmail.com>.
Okay. We have some (ugly) placeholder HTML there.[1] (feel free to make it a bit nicer…) ;-)

To publish changes to the site, all we need to do is push changes to the asf-site branch and it auto-updates.

[1]http://royale.apache.org/ <http://royale.apache.org/>

> On Sep 28, 2017, at 12:29 PM, Harbs <ha...@gmail.com> wrote:
> 
> Yeah. I’m trying to figure out how we actually publish the site.
> 
> So far I couldn’t figure it out. I just asked for help from INFRA.
> 
>> On Sep 28, 2017, at 12:22 PM, Erik de Bruin <er...@ixsoftware.nl> wrote:
>> 
>> Thanks, that makes sense.
>> 
>> EdB
>> 
>> 
>> 
>> On Thu, Sep 28, 2017 at 11:20 AM, Piotr Zarzycki <pi...@gmail.com>
>> wrote:
>> 
>>> Hi Erik,
>>> 
>>> I saw that Daniel from Infra mention that this branch is required for them.
>>> Take a look into the comments [1]
>>> 
>>> [1] https://issues.apache.org/jira/browse/INFRA-15146
>>> 
>>> Thanks, Piotr
>>> 
>>> 
>>> 2017-09-28 11:11 GMT+02:00 Erik de Bruin <er...@apache.org>:
>>> 
>>>> I inadvertantly made a commit to "master". I assume the 'asf-site' branch
>>>> is equal to the usual 'develop' branch? I have also merged the change
>>> from
>>>> master to asf-site, simply to make those equal again.
>>>> 
>>>> Maybe we should consider a renaming of 'asf-site' to 'develop' to make
>>>> that consistent with the other repos?
>>>> 
>>>> Also, it seems to me to make sense to change the default branch on GitHub
>>>> to the actual default branch for devs?
>>>> 
>>>> Thanks,
>>>> 
>>>> EdB
>>>> 
>>>> 
>>>> 
>>>> On Thu, Sep 28, 2017 at 11:05 AM, <er...@apache.org> wrote:
>>>> 
>>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>> 
>>>>> erikdebruin pushed a change to branch asf-site
>>>>> in repository https://gitbox.apache.org/repos/asf/royale-website.git.
>>>>> 
>>>>> 
>>>>>   from b041811  Initial Commit
>>>>>    add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
>>>>>    new 06e2e6f  Merge branch 'master' into asf-site
>>>>> 
>>>>> The 1 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:
>>>>> readme.md | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>> 
>>>>> --
>>>>> To stop receiving notification emails like this one, please contact
>>>>> ['"commits@royale.apache.org" <co...@royale.apache.org>'].
>>>>> 
>>>> 
>>>> 
>>> 
>>> 
>>> --
>>> 
>>> Piotr Zarzycki
>>> 
>>> mobile: +48 880 859 557
>>> skype: zarzycki10
>>> 
>>> LinkedIn: http://www.linkedin.com/piotrzarzycki
>>> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552>
>>> 
>>> GitHub: https://github.com/piotrzarzycki21
>>> 
>> 
>> 
>> 
>> -- 
>> Ix Multimedia Software
>> 
>> Jan Luykenstraat 27
>> 3521 VB Utrecht
>> 
>> T. 06-51952295
>> I. www.ixsoftware.nl
> 


Re: [royale-website] branch asf-site updated (b041811 -> 06e2e6f)

Posted by Harbs <ha...@gmail.com>.
Yeah. I’m trying to figure out how we actually publish the site.

So far I couldn’t figure it out. I just asked for help from INFRA.

> On Sep 28, 2017, at 12:22 PM, Erik de Bruin <er...@ixsoftware.nl> wrote:
> 
> Thanks, that makes sense.
> 
> EdB
> 
> 
> 
> On Thu, Sep 28, 2017 at 11:20 AM, Piotr Zarzycki <pi...@gmail.com>
> wrote:
> 
>> Hi Erik,
>> 
>> I saw that Daniel from Infra mention that this branch is required for them.
>> Take a look into the comments [1]
>> 
>> [1] https://issues.apache.org/jira/browse/INFRA-15146
>> 
>> Thanks, Piotr
>> 
>> 
>> 2017-09-28 11:11 GMT+02:00 Erik de Bruin <er...@apache.org>:
>> 
>>> I inadvertantly made a commit to "master". I assume the 'asf-site' branch
>>> is equal to the usual 'develop' branch? I have also merged the change
>> from
>>> master to asf-site, simply to make those equal again.
>>> 
>>> Maybe we should consider a renaming of 'asf-site' to 'develop' to make
>>> that consistent with the other repos?
>>> 
>>> Also, it seems to me to make sense to change the default branch on GitHub
>>> to the actual default branch for devs?
>>> 
>>> Thanks,
>>> 
>>> EdB
>>> 
>>> 
>>> 
>>> On Thu, Sep 28, 2017 at 11:05 AM, <er...@apache.org> wrote:
>>> 
>>>> This is an automated email from the ASF dual-hosted git repository.
>>>> 
>>>> erikdebruin pushed a change to branch asf-site
>>>> in repository https://gitbox.apache.org/repos/asf/royale-website.git.
>>>> 
>>>> 
>>>>    from b041811  Initial Commit
>>>>     add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
>>>>     new 06e2e6f  Merge branch 'master' into asf-site
>>>> 
>>>> The 1 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:
>>>> readme.md | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>> 
>>>> --
>>>> To stop receiving notification emails like this one, please contact
>>>> ['"commits@royale.apache.org" <co...@royale.apache.org>'].
>>>> 
>>> 
>>> 
>> 
>> 
>> --
>> 
>> Piotr Zarzycki
>> 
>> mobile: +48 880 859 557
>> skype: zarzycki10
>> 
>> LinkedIn: http://www.linkedin.com/piotrzarzycki
>> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552>
>> 
>> GitHub: https://github.com/piotrzarzycki21
>> 
> 
> 
> 
> -- 
> Ix Multimedia Software
> 
> Jan Luykenstraat 27
> 3521 VB Utrecht
> 
> T. 06-51952295
> I. www.ixsoftware.nl


Re: [royale-website] branch asf-site updated (b041811 -> 06e2e6f)

Posted by Erik de Bruin <er...@ixsoftware.nl>.
Thanks, that makes sense.

EdB



On Thu, Sep 28, 2017 at 11:20 AM, Piotr Zarzycki <pi...@gmail.com>
wrote:

> Hi Erik,
>
> I saw that Daniel from Infra mention that this branch is required for them.
> Take a look into the comments [1]
>
> [1] https://issues.apache.org/jira/browse/INFRA-15146
>
> Thanks, Piotr
>
>
> 2017-09-28 11:11 GMT+02:00 Erik de Bruin <er...@apache.org>:
>
> > I inadvertantly made a commit to "master". I assume the 'asf-site' branch
> > is equal to the usual 'develop' branch? I have also merged the change
> from
> > master to asf-site, simply to make those equal again.
> >
> > Maybe we should consider a renaming of 'asf-site' to 'develop' to make
> > that consistent with the other repos?
> >
> > Also, it seems to me to make sense to change the default branch on GitHub
> > to the actual default branch for devs?
> >
> > Thanks,
> >
> > EdB
> >
> >
> >
> > On Thu, Sep 28, 2017 at 11:05 AM, <er...@apache.org> wrote:
> >
> >> This is an automated email from the ASF dual-hosted git repository.
> >>
> >> erikdebruin pushed a change to branch asf-site
> >> in repository https://gitbox.apache.org/repos/asf/royale-website.git.
> >>
> >>
> >>     from b041811  Initial Commit
> >>      add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
> >>      new 06e2e6f  Merge branch 'master' into asf-site
> >>
> >> The 1 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:
> >>  readme.md | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> --
> >> To stop receiving notification emails like this one, please contact
> >> ['"commits@royale.apache.org" <co...@royale.apache.org>'].
> >>
> >
> >
>
>
> --
>
> Piotr Zarzycki
>
> mobile: +48 880 859 557
> skype: zarzycki10
>
> LinkedIn: http://www.linkedin.com/piotrzarzycki
> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552>
>
> GitHub: https://github.com/piotrzarzycki21
>



-- 
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Re: [royale-website] branch asf-site updated (b041811 -> 06e2e6f)

Posted by Piotr Zarzycki <pi...@gmail.com>.
Hi Erik,

I saw that Daniel from Infra mention that this branch is required for them.
Take a look into the comments [1]

[1] https://issues.apache.org/jira/browse/INFRA-15146

Thanks, Piotr


2017-09-28 11:11 GMT+02:00 Erik de Bruin <er...@apache.org>:

> I inadvertantly made a commit to "master". I assume the 'asf-site' branch
> is equal to the usual 'develop' branch? I have also merged the change from
> master to asf-site, simply to make those equal again.
>
> Maybe we should consider a renaming of 'asf-site' to 'develop' to make
> that consistent with the other repos?
>
> Also, it seems to me to make sense to change the default branch on GitHub
> to the actual default branch for devs?
>
> Thanks,
>
> EdB
>
>
>
> On Thu, Sep 28, 2017 at 11:05 AM, <er...@apache.org> wrote:
>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> erikdebruin pushed a change to branch asf-site
>> in repository https://gitbox.apache.org/repos/asf/royale-website.git.
>>
>>
>>     from b041811  Initial Commit
>>      add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
>>      new 06e2e6f  Merge branch 'master' into asf-site
>>
>> The 1 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:
>>  readme.md | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> --
>> To stop receiving notification emails like this one, please contact
>> ['"commits@royale.apache.org" <co...@royale.apache.org>'].
>>
>
>


-- 

Piotr Zarzycki

mobile: +48 880 859 557
skype: zarzycki10

LinkedIn: http://www.linkedin.com/piotrzarzycki
<https://pl.linkedin.com/in/piotr-zarzycki-92a53552>

GitHub: https://github.com/piotrzarzycki21

Re: [royale-website] branch asf-site updated (b041811 -> 06e2e6f)

Posted by Erik de Bruin <er...@apache.org>.
I inadvertantly made a commit to "master". I assume the 'asf-site' branch
is equal to the usual 'develop' branch? I have also merged the change from
master to asf-site, simply to make those equal again.

Maybe we should consider a renaming of 'asf-site' to 'develop' to make that
consistent with the other repos?

Also, it seems to me to make sense to change the default branch on GitHub
to the actual default branch for devs?

Thanks,

EdB



On Thu, Sep 28, 2017 at 11:05 AM, <er...@apache.org> wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> erikdebruin pushed a change to branch asf-site
> in repository https://gitbox.apache.org/repos/asf/royale-website.git.
>
>
>     from b041811  Initial Commit
>      add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
>      new 06e2e6f  Merge branch 'master' into asf-site
>
> The 1 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:
>  readme.md | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> --
> To stop receiving notification emails like this one, please contact
> ['"commits@royale.apache.org" <co...@royale.apache.org>'].
>

Re: [royale-website] branch asf-site updated (b041811 -> 06e2e6f)

Posted by Erik de Bruin <er...@apache.org>.
I inadvertantly made a commit to "master". I assume the 'asf-site' branch
is equal to the usual 'develop' branch? I have also merged the change from
master to asf-site, simply to make those equal again.

Maybe we should consider a renaming of 'asf-site' to 'develop' to make that
consistent with the other repos?

Also, it seems to me to make sense to change the default branch on GitHub
to the actual default branch for devs?

Thanks,

EdB



On Thu, Sep 28, 2017 at 11:05 AM, <er...@apache.org> wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> erikdebruin pushed a change to branch asf-site
> in repository https://gitbox.apache.org/repos/asf/royale-website.git.
>
>
>     from b041811  Initial Commit
>      add f0aa422  Flexing (“Royaling”?) my commit muscle ;-)
>      new 06e2e6f  Merge branch 'master' into asf-site
>
> The 1 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:
>  readme.md | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> --
> To stop receiving notification emails like this one, please contact
> ['"commits@royale.apache.org" <co...@royale.apache.org>'].
>