Skip to content
Commit dbe586ce authored by Nigel Magnay's avatar Nigel Magnay
Browse files

Merge remote branch 'origin/master' into momo

* origin/master: (28 commits)
  Need to run install during prepare, or else the release:perform fails miserably.
  Enabled more convenient access to the XSTREAM field
  added a method to help plugins rename classes and still keep backward compatibility
  Rely on released versions
  Test files accidentally crept in.
  modified to use the type-safe tag lib interface.
  Hooking the taglib interface generation.
  [JENKINS-9326] add integration tests with eclipse tycho relocation
  experimenting with the taglib interface generator
  fixed NPE
  Converted a few more pages into Groovy to test the behaviour. Allow global.jelly to be written in Groovy.
  Jenkins
  auto-completes instance and descriptor
  Support global.groovy as well as config.groovy
  A few more Jelly files switched to Groovy as a test
  Looks like a dead code.
  added DSLD for Eclipse
  1.166 shipped
  not specifying the file extension so that different pieces can be implemented by different view technologies
  replaced i18n by '_' since it shows up a lot.
  ...

Conflicts:
	core/src/main/java/hudson/model/Hudson.java
parents 79eb909b 3fb0fb2d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment