[incubator-netbeans] branch master updated (21f26b1 -> cf4164e)

[ge...@apache.org]

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

geertjan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.


    from 21f26b1  Merge pull request #261 from jlahoda/remove-unnecessary-notices
     add 8df6d14  [NETBEANS-129] For source zips, alter the nbbuild/cluster.properties so that the cluster.config property defaults to the cluster config packed in the zip.
     new cf4164e  Merge pull request #260 from jlahoda/rewrite-cluster-properties

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:
 nbbuild/build.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

[incubator-netbeans] 01/01: Merge pull request #260 from jlahoda/rewrite-cluster-properties

[ge...@apache.org]

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

geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit cf4164e39ab97a164e173b7ef09f70686a01b188
Merge: 21f26b1 8df6d14
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Wed Nov 8 23:07:13 2017 +0100

    Merge pull request #260 from jlahoda/rewrite-cluster-properties
    
    [NETBEANS-129] For source zips, alter the nbbuild/cluster.properties …

 nbbuild/build.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)


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