Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JENKINS-20271 : Added script arg labels #2

Merged
merged 5 commits into from Nov 21, 2013
Merged

Conversation

ganncamp
Copy link

No description provided.

@cloudbees-pull-request-builder

plugins » managed-scripts-plugin #5 SUCCESS
This pull request looks good

@jenkinsadmin
Copy link
Member

Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests

@imod
Copy link
Member

imod commented Nov 3, 2013

I'd love to merge this in, but the in the jelly files its hard to see what really changed...
do you really need to change every single line in these files? please don't use any auto formatting if you do this kind of changes.

@ganncamp
Copy link
Author

Very sorry about that Dominik! It looked like everything was double-tabbed
and it was pushing the lines off the right side of my screen. I wasn't
thinking about the implications for you when I changed the indents. :-(

The big change is really the addition of this just inside the <f:entry> tag:

I've just gotten back from vacation and am digging out from that, but when
I can I'll try to re-pull the source & make the changes again without
changing the whitespace.


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Sun, Nov 3, 2013 at 10:23 AM, Dominik Bartholdi <notifications@github.com

wrote:

I'd love to merge this in, but the in the jelly files its hard to see what
really changed...
do you really need to change every single line in these files? please
don't use any auto formatting if you do this kind of changes.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2#issuecomment-27646502
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are not
responsible for delivery of this message to that person) , you may not copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.


@cloudbees-pull-request-builder

plugins » managed-scripts-plugin #6 SUCCESS
This pull request looks good

@cloudbees-pull-request-builder

plugins » managed-scripts-plugin #7 SUCCESS
This pull request looks good

@cloudbees-pull-request-builder

plugins » managed-scripts-plugin #8 SUCCESS
This pull request looks good

@ganncamp
Copy link
Author

Dominik,

I'm still struggling with these whitespace changes. I'm flummoxed about why
it would do that only to the .jelly files. I've managed to fix it in the
ScriptBuildStep/config.jelly file, but the WinBatchBuildStep/config.jelly
file is still messed up. The changes are the same for both files, but I
will resume the struggle on Monday.

Ann


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Sun, Nov 3, 2013 at 10:23 AM, Dominik Bartholdi <notifications@github.com

wrote:

I'd love to merge this in, but the in the jelly files its hard to see what
really changed...
do you really need to change every single line in these files? please
don't use any auto formatting if you do this kind of changes.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2#issuecomment-27646502
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are not
responsible for delivery of this message to that person) , you may not copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.


@ganncamp
Copy link
Author

Finally worked through this. Some gratuitous whitespace changes remain, for
which I apologize. I'll be more mindful next time. But you should be able
to pick out the meat of the changes now.


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Fri, Nov 15, 2013 at 4:27 PM, Ann Campbell ann.campbell@shawinc.comwrote:

Dominik,

I'm still struggling with these whitespace changes. I'm flummoxed about
why it would do that only to the .jelly files. I've managed to fix it in
the ScriptBuildStep/config.jelly file, but the
WinBatchBuildStep/config.jelly file is still messed up. The changes are the
same for both files, but I will resume the struggle on Monday.

Ann


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Sun, Nov 3, 2013 at 10:23 AM, Dominik Bartholdi <
notifications@github.com> wrote:

I'd love to merge this in, but the in the jelly files its hard to see
what really changed...
do you really need to change every single line in these files? please
don't use any auto formatting if you do this kind of changes.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2#issuecomment-27646502
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are not
responsible for delivery of this message to that person) , you may not copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.


@cloudbees-pull-request-builder

plugins » managed-scripts-plugin #9 SUCCESS
This pull request looks good

@imod imod merged commit 25a70f3 into jenkinsci:master Nov 21, 2013
@ganncamp
Copy link
Author

ganncamp commented Dec 2, 2013

Dominick,

I don't know the protocols here, so I'll just ask: I see you've merged my
changes; is there something I can do to get a new release pushed out? Or
should I just sit on my hands & be patient? :-)

Thx,
Ann


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Thu, Nov 21, 2013 at 1:28 PM, Dominik Bartholdi <notifications@github.com

wrote:

Merged #2 #2.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are not
responsible for delivery of this message to that person) , you may not copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.


@imod
Copy link
Member

imod commented Dec 2, 2013

Just give a couple of days, I'll try to get a Release out in the Weekend -ok?

Am 02.12.2013 um 18:51 schrieb "G. Ann Campbell" notifications@github.com:

Dominick,

I don't know the protocols here, so I'll just ask: I see you've merged my
changes; is there something I can do to get a new release pushed out? Or
should I just sit on my hands & be patient? :-)

Thx,
Ann


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Thu, Nov 21, 2013 at 1:28 PM, Dominik Bartholdi <notifications@github.com

wrote:

Merged #2 #2.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are not
responsible for delivery of this message to that person) , you may not copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.



Reply to this email directly or view it on GitHub.

@ganncamp
Copy link
Author

ganncamp commented Dec 3, 2013

Wonderful! Thanks. :-)


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Mon, Dec 2, 2013 at 4:41 PM, Dominik Bartholdi
notifications@github.comwrote:

Just give a couple of days, I'll try to get a Release out in the Weekend
-ok?

Am 02.12.2013 um 18:51 schrieb "G. Ann Campbell" <
notifications@github.com>:

Dominick,

I don't know the protocols here, so I'll just ask: I see you've merged
my
changes; is there something I can do to get a new release pushed out? Or
should I just sit on my hands & be patient? :-)

Thx,
Ann


G. Ann Campbell
Systems Architect II
Shaw Industries Inc,
201 S. Hamilton St.
Dalton Ga 30720

On Thu, Nov 21, 2013 at 1:28 PM, Dominik Bartholdi <
notifications@github.com

wrote:

Merged #2 #2.


Reply to this email directly or view it on GitHub<
https://github.com/jenkinsci/managed-scripts-plugin/pull/2>
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are
not
responsible for delivery of this message to that person) , you may not
copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages
of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.



Reply to this email directly or view it on GitHub.


Reply to this email directly or view it on GitHubhttps://github.com//pull/2#issuecomment-29660535
.


Privileged and/or confidential information may be contained in this
message. If you are not the addressee indicated in this message (or are not
responsible for delivery of this message to that person) , you may not copy
or deliver this message to anyone. In such case, you should destroy this
message and notify the sender by reply e-mail.
If you or your employer do not consent to Internet e-mail for messages of
this kind, please advise the sender.
Shaw Industries does not provide or endorse any opinions, conclusions or
other information in this message that do not relate to the official
business of the company or its subsidiaries.


@imod
Copy link
Member

imod commented Dec 5, 2013

released with 1.1.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants