Branch: refs/heads/matrix_jdk
Home: https://github.com/jenkinsci/smartfrog-plugin
Commit: 40005c57eb6c0ef6afd21175ffcedd2a5f040192
https://github.com/jenkinsci/smartfrog-plugin/commit/40005c57eb6c0ef6afd21175ffcedd2a5f040192
Author: Vojtech Juranek <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M .gitignore
M etc/support/deploySF.sh
M etc/support/diagnoseSF.sh
M etc/support/runSF.sh
M etc/support/stopSF.sh
A smartfrog-plugin.iml
M src/main/java/builder/smartfrog/SmartFrogAction.java
M src/main/java/builder/smartfrog/SmartFrogBuilder.java
A src/main/java/builder/smartfrog/SmartFrogHost.java
A
src/main/java/builder/smartfrog/command_line/AbstractCommandLineBuilder.java
A src/main/java/builder/smartfrog/command_line/CommandLineBuilder.java
A
src/main/java/builder/smartfrog/command_line/CommandLineBuilderFactory.java
A src/main/java/builder/smartfrog/command_line/LinuxCommandLineBuilder.java
A
src/main/java/builder/smartfrog/command_line/WindowsCommandLineBuilder.java
M src/main/java/builder/smartfrog/util/Functions.java
M src/main/resources/builder/smartfrog/SmartFrogBuilder/config.jelly
A src/main/resources/builder/smartfrog/SmartFrogHost/config.jelly
Log Message:
-----------
Merge branch 'master' of https://github.com/jcechace/smartfrog-plugin into
pull2
Conflicts:
etc/support/deploySF.sh
etc/support/diagnoseSF.sh
etc/support/stopSF.sh
src/main/java/builder/smartfrog/SmartFrogAction.java
src/main/java/builder/smartfrog/SmartFrogBuilder.java
src/main/resources/builder/smartfrog/SmartFrogBuilder/config.jelly
Commit: 9849e735fb331417609a975319717b9840b1ad65
https://github.com/jenkinsci/smartfrog-plugin/commit/9849e735fb331417609a975319717b9840b1ad65
Author: Vojtech Juranek <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
M src/main/java/builder/smartfrog/SmartFrogAction.java
M src/main/java/builder/smartfrog/SmartFrogBuilder.java
Log Message:
-----------
Fix missing merge conflicts
Commit: 2466a5ecddaf00414143a46d923d742817488384
https://github.com/jenkinsci/smartfrog-plugin/commit/2466a5ecddaf00414143a46d923d742817488384
Author: Vojtech Juranek <[email protected]>
Date: 2013-06-18 (Tue, 18 Jun 2013)
Changed paths:
R smartfrog-plugin.iml
M src/main/java/builder/smartfrog/SmartFrogHost.java
M
src/main/java/builder/smartfrog/command_line/AbstractCommandLineBuilder.java
M src/main/java/builder/smartfrog/command_line/CommandLineBuilder.java
M
src/main/java/builder/smartfrog/command_line/CommandLineBuilderFactory.java
M src/main/java/builder/smartfrog/command_line/LinuxCommandLineBuilder.java
M
src/main/java/builder/smartfrog/command_line/WindowsCommandLineBuilder.java
Log Message:
-----------
Remove IDE crap and unused imports
Compare:
https://github.com/jenkinsci/smartfrog-plugin/compare/40005c57eb6c^...2466a5ecddaf
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
